1、增加函数声明

2、用宏控制测试程序
iDiy · Dec 11, 2018 · 91f862b · 91f862b
1 parent 2fbf93e
commit 91f862b
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 38 deletions.
diff --git a/AT45DB161D-Drv_Data/CWSettingsWindows.stg b/AT45DB161D-Drv_Data/CWSettingsWindows.stg
diff --git a/AT45DB161D-Drv_Data/Standard/ObjectCode/AT45DB161D.c.o b/AT45DB161D-Drv_Data/Standard/ObjectCode/AT45DB161D.c.o
diff --git a/AT45DB161D-Drv_Data/Standard/ObjectCode/MC9S12XEP100.c.o b/AT45DB161D-Drv_Data/Standard/ObjectCode/MC9S12XEP100.c.o
diff --git a/AT45DB161D-Drv_Data/Standard/ObjectCode/SPI_Drv.c.o b/AT45DB161D-Drv_Data/Standard/ObjectCode/SPI_Drv.c.o
diff --git a/AT45DB161D-Drv_Data/Standard/ObjectCode/Start12.c.o b/AT45DB161D-Drv_Data/Standard/ObjectCode/Start12.c.o
diff --git a/AT45DB161D-Drv_Data/Standard/ObjectCode/datapage.c.o b/AT45DB161D-Drv_Data/Standard/ObjectCode/datapage.c.o
diff --git a/AT45DB161D-Drv_Data/Standard/ObjectCode/main.c.o b/AT45DB161D-Drv_Data/Standard/ObjectCode/main.c.o
diff --git a/AT45DB161D-Drv_Data/Standard/ObjectCode/mcu.c.o b/AT45DB161D-Drv_Data/Standard/ObjectCode/mcu.c.o
diff --git a/AT45DB161D-Drv_Data/Standard/TargetDataWindows.tdt b/AT45DB161D-Drv_Data/Standard/TargetDataWindows.tdt
diff --git a/Sources/AT45DB161D.c b/Sources/AT45DB161D.c
@@ -149,6 +149,7 @@ void AT45_PageToBuffer1(uint16_t page)
 
 void AT45_Test(void)
 {
+    #if (AT45_TEST)
     int i;
     while (AT45_IsBusy());
     for (i = 0; i < AT_PAGE_SIZE; i++)
@@ -160,4 +161,5 @@ void AT45_Test(void)
     AT45_PageToBuffer1(0);
     AT45_ReadBuffer1(0, AT_PAGE_SIZE, test_buf2);
     AT45_ReadFlash(0, 0, AT_PAGE_SIZE, test_buf3);
+    #endif
 }
diff --git a/Sources/AT45DB161D.h b/Sources/AT45DB161D.h
@@ -18,5 +18,8 @@ void AT45_init(void);
 uint8_t AT45_IsBusy(void);
 void AT45_ReadFlash(uint16_t page, uint16_t offset, uint16_t sizes, uint8_t *out);
 void AT45_ReadBuffer1(uint16_t offset, uint16_t sizes, uint8_t *buf);
+void AT45_WriteBuffer1(uint16_t offset, uint16_t sizes, uint8_t *buf);
+void AT45_Buffer1ToPage(uint16_t page);
+void AT45_PageToBuffer1(uint16_t page);
 
 #endif /* AT45DB161D_H */
diff --git a/bin/Project.abs b/bin/Project.abs
diff --git a/bin/Project.abs.glo b/bin/Project.abs.glo
@@ -1,11 +1,11 @@
 S0290000443A5C74656D705C415434354442313631442D4472765C62696E5C50726F6A6563742E61627305
-S2247FC000CF2100C6055B134A8019FE4A8000FE0001C015C08021000421000000000000006E
+S2247FC000CF2100C6055B134A8019FE4A8000FE0001C015C08021000631000000000000005C
 S2247FC02000000000000000000000000000000000000000000000000000000000000000007C
 S2247FC0400000000000000000000000000000000000500000000000000087D7B7C6270659AB
 S2247FC06018450436FA3DEE8097260CE1002208E12122FC2702EE8037E6011AE5E6B20500BB
 S2067FC08000003A
 S2067FFFFEC000BD
-S2247F8000C6204A8086FE4A80BAFE4A8205FE10EFC6555B3F585B3F20F7FEC011FDC00F27D8
+S2247F8000C6204A8086FE4A80BAFE4A8275FE10EFC6555B3F585B3F20F7FEC011FDC00F2768
 S2247F80200E35ED31EC3169700434FB310326F2FEC013EC31270BED31180A30700434F92095
 S2247F8040F10A37790039C6075B35E680C13C22258716C0663C21100C140D200E280F3010AF
 S2247F80603C11C6078FC6098FC64F8FC6538FC6D78FC6DD5B344C3A40A7A74F3708FC7900B4
@@ -20,7 +20,12 @@ S2247F81604A80E5FEE6854A80E5FEC74A80E5FE2012EE80344A80FAFE306B00EE80086E80AD
 S2247F8180186389EC8926EA1C0258081B860A3B4A8123FE0471F91D025808C6D44A80E5FE4E
 S2247F81A0C74A80E5FEE6874A80E5FEE6884A80E5FEC74A80E5FE2012EE80344A80FAFE3058
 S2247F81C06B00EE80086E80186385EC8526EA1C0258083A0A3B4A8123FE0471F91D025808F5
-S2247F81E0C6534A80E5FEEC804949494949494A80E5FEE68158584A80E5FEC74A80E5FE1C12
-S2247F82000258083A0A4A8123FE0471F9C7874A81D4FEC7873BCE021034CC21014A818EFE0D
-S2177F8220C7876CA13BCE021034CC23114A8130FE1B860A79
+S2247F81E0C6844A80E5FEC74A80E5FEE6874A80E5FEE6884A80E5FE2010EE80E6004A80E528
+S2247F8200FEEE80086E80186385EC8526EC1C0258083A0A3B4A8123FE0471F91D025808C659
+S2247F8220834A80E5FEEC804949494949494A80E5FEE68158584A80E5FEC74A80E5FE1C0265
+S2247F824058083A0A3B4A8123FE0471F91D025808C6534A80E5FEEC804949494949494A8030
+S2247F8260E5FEE68158584A80E5FEC74A80E5FE1C0258083A0A3B4A8123FE0471F918698007
+S2247F8280EE80E6816BE22101186280EC808C02102DEEC7873BCE021034CC21014A81D4FECF
+S2247F82A01B84C7874A8213FEC7874A8244FEC7873BCE021034CC23114A818EFEC7876CA1C5
+S2137F82C03BCE021034CC25214A8130FE1B880A24
 S9030000FC
diff --git a/bin/Project.abs.s19 b/bin/Project.abs.s19
@@ -1,11 +1,11 @@
 S0290000443A5C74656D705C415434354442313631442D4472765C62696E5C50726F6A6563742E61627305
-S123C000CF2100C6055B134A8019FE4A8000FE0001C015C0802100042100000000000000EE
+S123C000CF2100C6055B134A8019FE4A8000FE0001C015C0802100063100000000000000DC
 S123C0200000000000000000000000000000000000000000000000000000000000000000FC
 S123C0400000000000000000000000000000000000500000000000000087D7B7C62706592B
 S123C06018450436FA3DEE8097260CE1002208E12122FC2702EE8037E6011AE5E6B205003B
 S105C0800000BA
 S105FFFEC0003D
-S224FE8000C6204A8086FE4A80BAFE4A8205FE10EFC6555B3F585B3F20F7FEC011FDC00F2759
+S224FE8000C6204A8086FE4A80BAFE4A8275FE10EFC6555B3F585B3F20F7FEC011FDC00F27E9
 S224FE80200E35ED31EC3169700434FB310326F2FEC013EC31270BED31180A30700434F92016
 S224FE8040F10A37790039C6075B35E680C13C22258716C0663C21100C140D200E280F301030
 S224FE80603C11C6078FC6098FC64F8FC6538FC6D78FC6DD5B344C3A40A7A74F3708FC790035
@@ -20,7 +20,12 @@ S224FE81604A80E5FEE6854A80E5FEC74A80E5FE2012EE80344A80FAFE306B00EE80086E802E
 S224FE8180186389EC8926EA1C0258081B860A3B4A8123FE0471F91D025808C6D44A80E5FECF
 S224FE81A0C74A80E5FEE6874A80E5FEE6884A80E5FEC74A80E5FE2012EE80344A80FAFE30D9
 S224FE81C06B00EE80086E80186385EC8526EA1C0258083A0A3B4A8123FE0471F91D02580876
-S224FE81E0C6534A80E5FEEC804949494949494A80E5FEE68158584A80E5FEC74A80E5FE1C93
-S224FE82000258083A0A4A8123FE0471F9C7874A81D4FEC7873BCE021034CC21014A818EFE8E
-S217FE8220C7876CA13BCE021034CC23114A8130FE1B860AFA
+S224FE81E0C6844A80E5FEC74A80E5FEE6874A80E5FEE6884A80E5FE2010EE80E6004A80E5A9
+S224FE8200FEEE80086E80186385EC8526EC1C0258083A0A3B4A8123FE0471F91D025808C6DA
+S224FE8220834A80E5FEEC804949494949494A80E5FEE68158584A80E5FEC74A80E5FE1C02E6
+S224FE824058083A0A3B4A8123FE0471F91D025808C6534A80E5FEEC804949494949494A80B1
+S224FE8260E5FEE68158584A80E5FEC74A80E5FE1C0258083A0A3B4A8123FE0471F918698088
+S224FE8280EE80E6816BE22101186280EC808C02102DEEC7873BCE021034CC21014A81D4FE50
+S224FE82A01B84C7874A8213FEC7874A8244FEC7873BCE021034CC23114A818EFEC7876CA146
+S213FE82C03BCE021034CC25214A8130FE1B880AA5
 S9030000FC
diff --git a/bin/Project.map b/bin/Project.map
@@ -27,7 +27,7 @@ Entry point: 0xC000 (_Startup)
 _startupData is allocated at 0xC00F and uses 6 Bytes
 extern struct _tagStartup {
   unsigned nofZeroOut     1
-  _Range   pZeroOut       0x2100     1057
+  _Range   pZeroOut       0x2100     1585
   _Copy    *toCopyDownBeg 0xC080
 } _startupData;
 
@@ -40,7 +40,7 @@ Section Name                    Size  Type     From       To       Segment
 .rodata                            8     R     0xC051     0xC058   ROM_C000
 NON_BANKED                        39     R     0xC059     0xC07F   ROM_C000
 .copy                              2     R     0xC080     0xC081   ROM_C000
-.text                            563     R   0xFE8000   0xFE8232   PAGE_FE
+.text                            719     R   0xFE8000   0xFE82CE   PAGE_FE
 .stack                           256   R/W     0x2000     0x20FF   RAM
 .abs_section_8                     1   N/I        0x8        0x8   .absSeg0
 .abs_section_9                     1   N/I        0x9        0x9   .absSeg1
@@ -780,12 +780,12 @@ NON_BANKED                        39     R     0xC059     0xC07F   ROM_C000
 .abs_section_3ec                   2   N/I      0x3EC      0x3ED   .absSeg735
 .abs_section_3ee                   2   N/I      0x3EE      0x3EF   .absSeg736
 .abs_section_3f2                   2   N/I      0x3F2      0x3F3   .absSeg737
-.bss                            1057   R/W     0x2100     0x2520   RAM
+.bss                            1585   R/W     0x2100     0x2730   RAM
 .vectSeg738_vect                   2     R     0xFFFE     0xFFFF   .vectSeg738
 
 Summary of section sizes per section type:
-READ_ONLY (R):         2B7 (dec:      695)
-READ_WRITE (R/W):      521 (dec:     1313)
+READ_ONLY (R):         353 (dec:      851)
+READ_WRITE (R/W):      731 (dec:     1841)
 NO_INIT (N/I):         383 (dec:      899)
 
 *********************************************************************************************
@@ -1217,7 +1217,7 @@ MODULE:                 -- MC9S12XEP100.c.o --
      _PPSM                                      255       1       1       0   .abs_section_255
      _WOMM                                      256       1       1       0   .abs_section_256
      _MODRR                                     257       1       1       0   .abs_section_257
-     _PTP                                       258       1       1      11   .abs_section_258
+     _PTP                                       258       1       1      15   .abs_section_258
      _PTIP                                      259       1       1       0   .abs_section_259
      _DDRP                                      25A       1       1       3   .abs_section_25a
      _RDRP                                      25B       1       1       0   .abs_section_25b
@@ -1570,19 +1570,22 @@ MODULE:                 -- SPI_Drv.c.o --
 MODULE:                 -- AT45DB161D.c.o --
 - PROCEDURES:
      AT45_init                               FE80BA      2B      43       2   .text       
-     AT45_Writebyte                          FE80E5      15      21      30   .text       
+     AT45_Writebyte                          FE80E5      15      21      48   .text       
      AT45_ReadByte                           FE80FA      13      19       6   .text       
      AT45_ReadStatus                         FE810D      16      22       2   .text       
-     AT45_IsBusy                             FE8123       D      13       8   .text       
+     AT45_IsBusy                             FE8123       D      13      12   .text       
      AT45_ReadFlash                          FE8130      5E      94       2   .text       
      AT45_ReadBuffer1                        FE818E      46      70       2   .text       
-     AT45_PageToBuffer1                      FE81D4      31      49       2   .text       
-     AT45_Test                               FE8205      2E      46       2   .text       
+     AT45_WriteBuffer1                       FE81D4      3F      63       2   .text       
+     AT45_Buffer1ToPage                      FE8213      31      49       2   .text       
+     AT45_PageToBuffer1                      FE8244      31      49       2   .text       
+     AT45_Test                               FE8275      5A      90       2   .text       
 - VARIABLES:
      SPI_PortConfig                            C051       8       8       1   .rodata     
      at45_status_reg                           2100       1       1       1   .bss        
-     test_buf2                                 2101     210     528       1   .bss        
-     test_buf3                                 2311     210     528       1   .bss        
+     test_buf1                                 2101     210     528       2   .bss        
+     test_buf2                                 2311     210     528       1   .bss        
+     test_buf3                                 2521     210     528       1   .bss        
 
 *********************************************************************************************
 MODULE STATISTIC
@@ -1594,7 +1597,7 @@ MODULE STATISTIC
   rtshc12.c.o (ansixbi.lib)                    0     39      0
   mcu.c.o                                      0     79      0
   SPI_Drv.c.o                                  0     41      0
-  AT45DB161D.c.o                            1057    377      8
+  AT45DB161D.c.o                            1585    533      8
   other                                      256     68      2
 
 *********************************************************************************************
@@ -1603,9 +1606,10 @@ SECTION USE IN OBJECT-ALLOCATION SECTION
 SECTION: ".text"
   main Init SetBusCLK_M MCUInit SPI_Init SPI_SendByte SPI_RecvByte AT45_init 
   AT45_Writebyte AT45_ReadByte AT45_ReadStatus AT45_IsBusy AT45_ReadFlash 
-  AT45_ReadBuffer1 AT45_PageToBuffer1 AT45_Test 
+  AT45_ReadBuffer1 AT45_WriteBuffer1 AT45_Buffer1ToPage AT45_PageToBuffer1 
+  AT45_Test 
 SECTION: ".bss"
-  at45_status_reg test_buf2 test_buf3 
+  at45_status_reg test_buf1 test_buf2 test_buf3 
 SECTION: ".init"
   _Startup 
 SECTION: ".rodata"
@@ -3576,7 +3580,7 @@ OBJECT LIST SORTED BY ADDRESS
      _PPSM                                      255       1       1       0   .abs_section_255
      _WOMM                                      256       1       1       0   .abs_section_256
      _MODRR                                     257       1       1       0   .abs_section_257
-     _PTP                                       258       1       1      11   .abs_section_258
+     _PTP                                       258       1       1      15   .abs_section_258
      _PTIP                                      259       1       1       0   .abs_section_259
      _DDRP                                      25A       1       1       3   .abs_section_25a
      _RDRP                                      25B       1       1       0   .abs_section_25b
@@ -3832,8 +3836,9 @@ OBJECT LIST SORTED BY ADDRESS
      _TIM_OCPD                                  3FC       1       1       0   .abs_section_3fc
      _TIM_PTPSR                                 3FE       1       1       0   .abs_section_3fe
      at45_status_reg                           2100       1       1       1   .bss        
-     test_buf2                                 2101     210     528       1   .bss        
-     test_buf3                                 2311     210     528       1   .bss        
+     test_buf1                                 2101     210     528       2   .bss        
+     test_buf2                                 2311     210     528       1   .bss        
+     test_buf3                                 2521     210     528       1   .bss        
      _Startup                                  C000       F      15       0   .init       
      SPI_PortConfig                            C051       8       8       1   .rodata     
      _LSHL                                     C059       D      13       1   NON_BANKED  
@@ -3846,14 +3851,16 @@ OBJECT LIST SORTED BY ADDRESS
      SPI_SendByte                            FE80A2       D      13       4   .text       
      SPI_RecvByte                            FE80AF       B      11       4   .text       
      AT45_init                               FE80BA      2B      43       2   .text       
-     AT45_Writebyte                          FE80E5      15      21      30   .text       
+     AT45_Writebyte                          FE80E5      15      21      48   .text       
      AT45_ReadByte                           FE80FA      13      19       6   .text       
      AT45_ReadStatus                         FE810D      16      22       2   .text       
-     AT45_IsBusy                             FE8123       D      13       8   .text       
+     AT45_IsBusy                             FE8123       D      13      12   .text       
      AT45_ReadFlash                          FE8130      5E      94       2   .text       
      AT45_ReadBuffer1                        FE818E      46      70       2   .text       
-     AT45_PageToBuffer1                      FE81D4      31      49       2   .text       
-     AT45_Test                               FE8205      2E      46       2   .text       
+     AT45_WriteBuffer1                       FE81D4      3F      63       2   .text       
+     AT45_Buffer1ToPage                      FE8213      31      49       2   .text       
+     AT45_PageToBuffer1                      FE8244      31      49       2   .text       
+     AT45_Test                               FE8275      5A      90       2   .text       
 
 *********************************************************************************************
 UNUSED-OBJECTS SECTION
@@ -3870,13 +3877,11 @@ mcu.c.o:
   MCUReset 
 SPI_Drv.c.o:
   SPI_SendData SPI_RecvData 
-AT45DB161D.c.o:
-  AT45_WriteBuffer1 AT45_Buffer1ToPage 
 NOT USED VARIABLES
 rtshc12.c.o (ansixbi.lib):
   _PowOfTwo_8 _PowOfTwo_16 _PowOfTwo_32 errno 
 AT45DB161D.c.o:
-  port test_buf1 
+  port 
 
 *********************************************************************************************
 COPYDOWN SECTION
@@ -3903,9 +3908,12 @@ AT45_IsBusy               USES AT45_ReadStatus
 AT45_ReadFlash            USES _LSHL AT45_IsBusy _PTP AT45_Writebyte 
                                 AT45_ReadByte 
 AT45_ReadBuffer1          USES AT45_IsBusy _PTP AT45_Writebyte AT45_ReadByte 
+AT45_WriteBuffer1         USES AT45_IsBusy _PTP AT45_Writebyte 
+AT45_Buffer1ToPage        USES AT45_IsBusy _PTP AT45_Writebyte 
 AT45_PageToBuffer1        USES AT45_IsBusy _PTP AT45_Writebyte 
-AT45_Test                 USES AT45_IsBusy AT45_PageToBuffer1 test_buf2 
-                                AT45_ReadBuffer1 test_buf3 AT45_ReadFlash 
+AT45_Test                 USES AT45_IsBusy test_buf1 AT45_WriteBuffer1 
+                                AT45_Buffer1ToPage AT45_PageToBuffer1 test_buf2 AT45_ReadBuffer1 
+                                test_buf3 AT45_ReadFlash 
 
 *********************************************************************************************
 DEPENDENCY TREE
@@ -3942,6 +3950,18 @@ DEPENDENCY TREE
  |     |        |  
  |     |        +- SPI_RecvByte         (see above)
  |     |           
+ |     +- AT45_WriteBuffer1   
+ |     |  | 
+ |     |  +- AT45_IsBusy          (see above)
+ |     |  |  
+ |     |  +- AT45_Writebyte       (see above)
+ |     |     
+ |     +- AT45_Buffer1ToPage  
+ |     |  | 
+ |     |  +- AT45_IsBusy          (see above)
+ |     |  |  
+ |     |  +- AT45_Writebyte       (see above)
+ |     |     
  |     +- AT45_PageToBuffer1  
  |     |  | 
  |     |  +- AT45_IsBusy          (see above)
@@ -3979,5 +3999,5 @@ STATISTIC SECTION
 ExeFile:
 --------
 Number of blocks to be downloaded: 6
-Total size of all blocks to be downloaded: 695
+Total size of all blocks to be downloaded: 851