OSDN Git Service

V01.02 master
authorSatoshi Yasuda <7m3tjz@jk1zrw.org>
Sun, 14 Oct 2012 15:02:25 +0000 (00:02 +0900)
committerSatoshi Yasuda <7m3tjz@jk1zrw.org>
Sun, 14 Oct 2012 15:02:25 +0000 (00:02 +0900)
Signed-off-by: Satoshi Yasuda <7m3tjz@jk1zrw.org>
Universal Bootloader/Firmware/Bootloader/Include/BootLoader.h
Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/Object - MDD File System-SD-PIC32/sd_bootloader.o
Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcs
Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcw
Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.elf
Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.hex
Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.map
Universal Bootloader/Firmware/Bootloader/Source/SD/sd_bootloader.c

index 56904fd..df29d1e 100644 (file)
@@ -29,7 +29,7 @@
 
 //-------User configurable macros begin---------
 #define MAJOR_VERSION 1
-#define MINOR_VERSION 0
+#define MINOR_VERSION 2
 
 
 /* APP_FLASH_BASE_ADDRESS and APP_FLASH_END_ADDRESS reserves program Flash for the application*/ 
                 
                2)The base address and end address must align on  4K address boundary */
                
-#define APP_FLASH_BASE_ADDRESS         0x9D006000 
+#define APP_FLASH_BASE_ADDRESS         0x9D005000 
 #define APP_FLASH_END_ADDRESS   PROGRAM_FLASH_END_ADRESS
 
 /* Address of  the Flash from where the application starts executing */
 /* Rule: Set APP_FLASH_BASE_ADDRESS to _RESET_ADDR value of application linker script*/
-#define USER_APP_RESET_ADDRESS         (0x9D006000 + 0x1000 + 0x970)
+#define USER_APP_RESET_ADDRESS         (0x9D005000 + 0x1000 + 0x970)
 
 
 //-------User configurable macros end-----------
index f55c5e4..0199a73 100644 (file)
Binary files a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/Object - MDD File System-SD-PIC32/sd_bootloader.o and b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/Object - MDD File System-SD-PIC32/sd_bootloader.o differ
index 2efe3bc..a3bc1f8 100644 (file)
@@ -13,7 +13,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
 SuiteArgsString=
 ToolArgsString=-g -mips16 -DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
 TraceCmdString=
-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
+DebugOptions=
 [File001]
 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\Object - MDD File System-SD-PIC32\FSIO.o
 Folder=Intermediary
@@ -26,7 +26,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
 SuiteArgsString=
 ToolArgsString=-DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
 TraceCmdString=
-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
+DebugOptions=
 [File002]
 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\Object - MDD File System-SD-PIC32\SD-SPI.o
 Folder=Intermediary
@@ -39,7 +39,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
 SuiteArgsString=
 ToolArgsString=-DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
 TraceCmdString=
-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
+DebugOptions=
 [File003]
 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\Object - MDD File System-SD-PIC32\NVMem.o
 Folder=Intermediary
@@ -52,7 +52,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
 SuiteArgsString=
 ToolArgsString=-DTRANSPORT_LAYER_SD_CARD -DDEMO_BOARD_ETH_STARTER_KIT -Os
 TraceCmdString=
-DebugOptions=-D__DEBUG -D__MPLAB_DEBUGGER_PIC32MXSK=1
+DebugOptions=
 [File004]
 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\.\output\SD_Card_Btl_Explorer16.elf
 Folder=Output
@@ -65,7 +65,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
 SuiteArgsString=
 ToolArgsString=-Map="$(BINDIR_)$(TARGETBASE).map" -o"$(BINDIR_)$(TARGETBASE).$(TARGETSUFFIX)"
 TraceCmdString=
-DebugOptions=--defsym=__MPLAB_DEBUG=1 --defsym=__MPLAB_DEBUGGER_PIC32MXSK=1
+DebugOptions=
 [File005]
 Location=C:\Universal Bootloader_011112\Universal Bootloader\Firmware\Bootloader\MPLAB_Workspace\.\output\SD_Card_Btl_Explorer16.hex
 Folder=Output
@@ -78,7 +78,7 @@ SOLK=<src>|..\Source\SD\sd_bootloader.c|..\Source\MDD File System\FSIO.c|..\Sour
 SuiteArgsString=
 ToolArgsString=-Map="$(BINDIR_)$(TARGETBASE).map" -o"$(BINDIR_)$(TARGETBASE).$(TARGETSUFFIX)"
 TraceCmdString=
-DebugOptions=--defsym=__MPLAB_DEBUG=1 --defsym=__MPLAB_DEBUGGER_PIC32MXSK=1
+DebugOptions=
 [TOOL_LOC_STAMPS]
 tool_loc{430F471F-7ECB-4852-A80D-DEF9A5C8E751}=C:\Program Files\Microchip\mplabc32\v2.02\bin\pic32-gcc.exe
 tool_loc{C68E5105-1196-4333-A0BF-3DC57271E614}=C:\Program Files\Microchip\mplabc32\v2.02\bin\pic32-ld.exe
index 90f6081..7f77796 100644 (file)
Binary files a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcw and b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/SD_Card_Btl_Explorer16.mcw differ
index dc5afd8..c771129 100644 (file)
Binary files a/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.elf and b/Universal Bootloader/Firmware/Bootloader/MPLAB_Workspace/output/SD_Card_Btl_Explorer16.elf differ
index e6aa666..3425bdb 100644 (file)
 :102da8001400bfaf03000424a90f400f002005241e
 :102db800002042300100422c1400bf8f0800e003bd
 :102dc8001800bd27e8ffbd271400bfaf009d023cd7
-:102dd8007079422409f84000000000001400bf8ff9
+:102dd8007069422409f84000000000001400bf8f09
 :102de8000800e0031800bd2700008390d0ff62248c
 :102df800ff0042303700422c1b0040102110000019
 :102e08003a00662c0300c0100f006330890b400b9a
 :102e6800e8ffc0143a00662c0800e00300000000e8
 :102e7800d8ffbd272400bfaf2000b3af1c00b2affe
 :102e88001800b1af1400b0af88bf023c6020428c7c
-:102e980000a042240010422c18004014009d103c51
-:102ea800006010262188000088bf123c88bf133cb0
+:102e980000b042240010422c18004014009d103c41
+:102ea800005010262188000088bf123c88bf133cc0
 :102eb800b10d400f21200002030040100000000067
 :102ec800b20b400b00000000e060438e8000637c82
 :102ed80001006338e060428e8410627ce06042ae9c
-:102ee800010031266020628e00a0422402130200f5
+:102ee800010031266020628e00b0422402130200e5
 :102ef8002b102202eeff4014001010262400bf8f72
 :102f08002000b38f1c00b28f1800b18f1400b08f4f
 :102f18000800e0032800bd27d0ffbd272c00bfaf65
 :102ff800060040a001008390050043a002008390d2
 :10300800040043a01800448c0400438c2120830052
 :103018001400438c21188300040043ac00a0103c2a
-:10302800009d123c00605226420c400b88bf133ca6
+:10302800009d123c00505226420c400b88bf133cb6
 :103038000400428c0080113c258822022b103202a9
 :1030480023004014200d02266020638eff9c023c62
 :10305800ffff4234211062002b1051001c00401465
 :103178002c00bf8f200d4224140040ac180040ac36
 :103188002c00bf8f2800b38f2400b28f2000b18f8e
 :103198001c00b08f0800e0033000bd27009d023cf2
-:1031a8007079428c010042240800e0032b100200d1
+:1031a8007069428c010042240800e0032b100200e1
 :1031b800d0ffbd272c00bfaf2800b4af2400b3afa9
 :1031c8002000b2af1c00b1af1800b0af1400a0a32c
 :1031d8004610400f000000002188400040000324f2
index 6e10b3f..22d4943 100644 (file)
@@ -860,25 +860,25 @@ LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../.
  .debug_abbrev  0x00000574       0x25 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(port_read_bits_lib.o)
  .debug_abbrev  0x00000599        0x1 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
 
-.debug_line     0x00000000      0x9b6
+.debug_line     0x00000000      0x9b4
  *(.debug_line)
- .debug_line    0x00000000      0x347 Object - MDD File System-SD-PIC32\sd_bootloader.o
- .debug_line    0x00000347       0x87 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctypef.o)
- .debug_line    0x000003ce       0xa4 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-general-exception-handler.o)
- .debug_line    0x00000472       0xa6 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-bootstrap-exception-handler.o)
- .debug_line    0x00000518       0x93 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-reset.o)
- .debug_line    0x000005ab       0x97 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-bootstrap.o)
- .debug_line    0x00000642        0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctype.o)
- .debug_line    0x00000642       0x6e c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(read_core_timer_lib.o)
- .debug_line    0x000006b0       0x6f c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(write_core_timer_lib.o)
- .debug_line    0x0000071f       0x62 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(pcache.o)
- .debug_line    0x00000781       0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_disable_interrupts_lib.o)
- .debug_line    0x000007f4       0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_restore_interrupts_lib.o)
- .debug_line    0x00000867       0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_getc_spi1_lib_legacy.o)
- .debug_line    0x000008d8       0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_open_spi1_lib_legacy.o)
- .debug_line    0x00000949        0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_brg_tbl_lib_legacy.o)
- .debug_line    0x00000949       0x6d c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(port_read_bits_lib.o)
- .debug_line    0x000009b6        0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
+ .debug_line    0x00000000      0x345 Object - MDD File System-SD-PIC32\sd_bootloader.o
+ .debug_line    0x00000345       0x87 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctypef.o)
+ .debug_line    0x000003cc       0xa4 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-general-exception-handler.o)
+ .debug_line    0x00000470       0xa6 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-bootstrap-exception-handler.o)
+ .debug_line    0x00000516       0x93 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-reset.o)
+ .debug_line    0x000005a9       0x97 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(default-on-bootstrap.o)
+ .debug_line    0x00000640        0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libc.a(ctype.o)
+ .debug_line    0x00000640       0x6e c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(read_core_timer_lib.o)
+ .debug_line    0x000006ae       0x6f c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral.a(write_core_timer_lib.o)
+ .debug_line    0x0000071d       0x62 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(pcache.o)
+ .debug_line    0x0000077f       0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_disable_interrupts_lib.o)
+ .debug_line    0x000007f2       0x73 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(int_restore_interrupts_lib.o)
+ .debug_line    0x00000865       0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_getc_spi1_lib_legacy.o)
+ .debug_line    0x000008d6       0x71 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_open_spi1_lib_legacy.o)
+ .debug_line    0x00000947        0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(spi_brg_tbl_lib_legacy.o)
+ .debug_line    0x00000947       0x6d c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(port_read_bits_lib.o)
+ .debug_line    0x000009b4        0x0 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
 
 .debug_frame    0x00000000      0x370
  *(.debug_frame)
@@ -1002,8 +1002,6 @@ LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../.
  .gnu.attributes
                 0x00000130       0x10 c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libmchp_peripheral_32MX795F512L.a(_ports_tbl_libp.o)
                 0x00000001                __MPLAB_BUILD = 0x1
-                0x00000001                __MPLAB_DEBUG = 0x1
-                0x00000001                __MPLAB_DEBUGGER_PIC32MXSK = 0x1
 LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1\libgcc.a
 START GROUP
 LOAD c:/program files/microchip/mplabc32/v2.02/bin/../lib/gcc/pic32mx/4.5.1/../../../../pic32mx/lib\libdebug.a
index ecec975..942691c 100644 (file)
@@ -136,18 +136,6 @@ int main(void)
         JumpToApp();        
     }
 
-#if   (((__PIC32_FEATURE_SET__ >= 100) && (__PIC32_FEATURE_SET__ <= 299)))
-               #error("TODO: For PIC32MX1xx/PIC32MX2xx devices, user must map the SPI ports to required I/Os using PPS");
-               /* Example Code
-               PPSInput(3,SDI2,RPn); // SDI2 mapping, where RPn = RPA2, RPB6....
-       
-       PPSOutput(2,RPn,SDO2);// SDO2 on RPA8
-    
-       //Do not forget to switch-off corrresponding "analog selection".
-       ANSELx = 0;
-       */
-#endif
-
     //Initialize the media
     while (!MDD_MediaDetect())
     {
@@ -246,11 +234,11 @@ int main(void)
                 
      }//while(1)
   
-    Delayms(100);
+    Delayms(500);
 
        Reset();
 
-    return 0;
+//    return 0;
 }