Update the dsPIC MPLAB demo for use with the latest 3.25 version of the compiler.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1265 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/dsPIC_MPLAB/RTOSDemo.mcw b/Demo/dsPIC_MPLAB/RTOSDemo.mcw
index 69316a669268ca31333f4244a12568603e8176a6..6a2a4ff05d627ceb95cc03cef89b913d4c8ef8f5 100644 (file)
Binary files a/Demo/dsPIC_MPLAB/RTOSDemo.mcw and b/Demo/dsPIC_MPLAB/RTOSDemo.mcw differ

diff --git a/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcp b/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcp
index 3baeb6fd5d69af06b898a818a0792f07de01d452..d422901ddf9c50aafe20d1fe943b7b491c62d0ff 100644 (file)
--- a/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcp
+++ b/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcp
@@ -1,6 +1,7 @@
 [HEADER]\r
 magic_cookie={66E99B07-E706-4689-9E80-9B2582898A13}\r
 file_version=1.0\r
+device=dsPIC33FJ256GP710\r
 [PATH_INFO]\r
 BuildDirPolicy=BuildDirIsSourceDir\r
 dir_src=\r
@@ -17,7 +18,7 @@ filter_obj=*.o
 filter_lib=*.a\r
 filter_lkr=*.gld\r
 [CAT_SUBFOLDERS]\r
-subfolder_src=\r
+subfolder_src=FreeRTOS Source;Standard Demo Source\r
 subfolder_inc=\r
 subfolder_obj=\r
 subfolder_lib=\r
@@ -28,18 +29,18 @@ file_001=.
 file_002=.\r
 file_003=.\r
 file_004=.\r
-file_005=.\r
-file_006=.\r
-file_007=.\r
-file_008=.\r
-file_009=.\r
-file_010=.\r
-file_011=.\r
-file_012=.\r
-file_013=.\r
-file_014=.\r
-file_015=.\r
-file_016=.\r
+file_005=Standard Demo Source\r
+file_006=Standard Demo Source\r
+file_007=Standard Demo Source\r
+file_008=Standard Demo Source\r
+file_009=FreeRTOS Source\r
+file_010=FreeRTOS Source\r
+file_011=Standard Demo Source\r
+file_012=FreeRTOS Source\r
+file_013=FreeRTOS Source\r
+file_014=FreeRTOS Source\r
+file_015=FreeRTOS Source\r
+file_016=FreeRTOS Source\r
 file_017=.\r
 file_018=.\r
 file_019=.\r
@@ -96,22 +97,22 @@ file_021=no
 file_022=no\r
 [FILE_INFO]\r
 file_000=main.c\r
-file_001=..\..\source\list.c\r
-file_002=..\..\source\queue.c\r
-file_003=..\..\source\tasks.c\r
-file_004=..\..\source\portable\MPLAB\PIC24_dsPIC\port.c\r
-file_005=..\..\source\portable\MemMang\heap_1.c\r
-file_006=..\Common\Minimal\BlockQ.c\r
-file_007=..\..\source\croutine.c\r
+file_001=ParTest\ParTest.c\r
+file_002=serial\serial.c\r
+file_003=timertest.c\r
+file_004=lcd.c\r
+file_005=..\Common\Minimal\BlockQ.c\r
+file_006=..\Common\Minimal\blocktim.c\r
+file_007=..\Common\Minimal\comtest.c\r
 file_008=..\Common\Minimal\crflash.c\r
-file_009=ParTest\ParTest.c\r
-file_010=..\Common\Minimal\blocktim.c\r
+file_009=..\..\source\croutine.c\r
+file_010=..\..\source\portable\MemMang\heap_1.c\r
 file_011=..\Common\Minimal\integer.c\r
-file_012=..\Common\Minimal\comtest.c\r
-file_013=serial\serial.c\r
-file_014=timertest.c\r
-file_015=lcd.c\r
-file_016=..\..\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S\r
+file_012=..\..\source\list.c\r
+file_013=..\..\source\portable\MPLAB\PIC24_dsPIC\port.c\r
+file_014=..\..\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S\r
+file_015=..\..\source\queue.c\r
+file_016=..\..\source\tasks.c\r
 file_017=..\..\source\include\semphr.h\r
 file_018=..\..\source\include\task.h\r
 file_019=..\..\source\include\croutine.h\r
@@ -125,7 +126,7 @@ suite_state=
 TS{7D9C6ECE-785D-44CB-BA22-17BF2E119622}=-g\r
 TS{25AC22BD-2378-4FDB-BFB6-7345A15512D3}=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
 TS{25AC22BD-2378-4FDB-BFB6-7345A15512D3}_alt=yes\r
-TS{7DAC9A1D-4C45-45D6-B25A-D117C74E8F5A}=--defsym=__ICD2RAM=1 -Map="$(TARGETBASE).map" -o"$(TARGETBASE).$(TARGETSUFFIX)"\r
+TS{7DAC9A1D-4C45-45D6-B25A-D117C74E8F5A}=--heap=0 --defsym=__ICD2RAM=1 -o"$(BINDIR_)$(TARGETBASE).$(TARGETSUFFIX)"\r
 TS{509E5861-1E2A-483B-8B6B-CA8DB7F2DD78}=\r
 [INSTRUMENTED_TRACE]\r
 enable=0\r

diff --git a/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcs b/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcs
index 30ac2b2eae0154b20c41e54e802832a5188ecd56..2b67bf1590dfe0a9e26180abe1c41cd2335ffbbd 100644 (file)
--- a/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcs
+++ b/Demo/dsPIC_MPLAB/RTOSDemo_dsPIC.mcs
@@ -1,254 +1,7 @@
 [Header]\r
 MagicCookie={0b13fe8c-dfe0-40eb-8900-6712719559a7}\r
 Version=1.0\r
-[File000]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\dsPIC_MPLAB\main.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File001]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\source\list.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File002]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\source\queue.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File003]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\source\tasks.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File004]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\source\portable\MPLAB\PIC24_dsPIC\port.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File005]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\source\portable\MemMang\heap_1.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File006]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\Common\Minimal\BlockQ.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File007]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\source\croutine.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File008]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\Common\Minimal\crflash.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File009]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\dsPIC_MPLAB\ParTest\ParTest.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File010]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\Common\Minimal\blocktim.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File011]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\Common\Minimal\integer.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File012]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\Common\Minimal\comtest.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File013]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\dsPIC_MPLAB\serial\serial.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File014]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\dsPIC_MPLAB\timertest.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File015]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\dsPIC_MPLAB\lcd.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={069BD372-6CA0-40D4-BF2F-5DC806D05083}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-fno-omit-frame-pointer -g -Wall -DMPLAB_DSPIC_PORT -O2 -fno-schedule-insns -fno-schedule-insns2\r
-TraceCmdString=\r
-DebugOptions=-D__DEBUG\r
-[File016]\r
-Location=C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.o\r
-Folder=Intermediary\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={DE18EB1A-B46B-486B-B96F-A811A635DFAC}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-as.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=-g\r
-TraceCmdString=\r
-DebugOptions=--defsym=__DEBUG=1\r
-[File017]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\dsPIC_MPLAB\RTOSDemo_dsPIC.cof\r
-Folder=Output\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={433C3D55-811D-409D-A6BF-159CF9355B42}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-ld.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=--defsym=__ICD2RAM=1 -Map="$(TARGETBASE).map" -o"$(TARGETBASE).$(TARGETSUFFIX)"\r
-TraceCmdString=\r
-DebugOptions=--defsym=__MPLAB_DEBUG=1 --defsym=__MPLAB_DEBUGGER_REAL_ICE=1 --defsym=__ICD2RAM=1\r
-[File018]\r
-Location=C:\E\temp\rc\4\V5.0.3\FreeRTOS\Demo\dsPIC_MPLAB\RTOSDemo_dsPIC.hex\r
-Folder=Output\r
-DeviceName=dsPIC33FJ256GP710\r
-LanguageToolSuiteID={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
-LanguageToolID={433C3D55-811D-409D-A6BF-159CF9355B42}\r
-LanguageToolLocation=C:\Devtools\Microchip\MPLAB C30\bin\pic30-ld.exe\r
-PPAD=$(BINDIR)||$(TMPDIR)||$(AINDIR)||$(INCDIR)|.;.\include;..\include;..\..\include;..\..\..\include;..\..\Source\include;..\..\..\Source\include;..\Demo\dsPIC_MPLAB;..\..\..\Demo\dsPIC_MPLAB;..\..\..\..\Demo\dsPIC_MPLAB;.\FileSystem;..\Common\include;..\..\Common\include||$(LIBDIR)||$(LKRDIR)||\r
-SOLK=<src>|main.c|..\..\source\list.c|..\..\source\queue.c|..\..\source\tasks.c|..\..\source\portable\MPLAB\PIC24_dsPIC\port.c|..\..\source\portable\MemMang\heap_1.c|..\Common\Minimal\BlockQ.c|..\..\source\croutine.c|..\Common\Minimal\crflash.c|ParTest\ParTest.c|..\Common\Minimal\blocktim.c|..\Common\Minimal\integer.c|..\Common\Minimal\comtest.c|serial\serial.c|timertest.c|lcd.c|C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_dsPIC.S||<obj>||<lib>||<lkr>|p33FJ256GP710.gld||\r
-SuiteArgsString=\r
-ToolArgsString=--defsym=__ICD2RAM=1 -Map="$(TARGETBASE).map" -o"$(TARGETBASE).$(TARGETSUFFIX)"\r
-TraceCmdString=\r
-DebugOptions=--defsym=__MPLAB_DEBUG=1 --defsym=__MPLAB_DEBUGGER_REAL_ICE=1 --defsym=__ICD2RAM=1\r
 [TOOL_LOC_STAMPS]\r
-tool_loc{DE18EB1A-B46B-486B-B96F-A811A635DFAC}=C:\Devtools\Microchip\MPLAB C30\bin\pic30-as.exe\r
-tool_loc{069BD372-6CA0-40D4-BF2F-5DC806D05083}=C:\Devtools\Microchip\MPLAB C30\bin\pic30-gcc.exe\r
-tool_loc{433C3D55-811D-409D-A6BF-159CF9355B42}=C:\Devtools\Microchip\MPLAB C30\bin\pic30-ld.exe\r
+tool_loc{DE18EB1A-B46B-486B-B96F-A811A635DFAC}=C:\devtools\Microchip\mplabc30\v3.25\bin\pic30-as.exe\r
+tool_loc{069BD372-6CA0-40D4-BF2F-5DC806D05083}=C:\devtools\Microchip\mplabc30\v3.25\bin\pic30-gcc.exe\r
+tool_loc{433C3D55-811D-409D-A6BF-159CF9355B42}=C:\devtools\Microchip\mplabc30\v3.25\bin\pic30-ld.exe\r

diff --git a/Demo/dsPIC_MPLAB/p33FJ256GP710.gld b/Demo/dsPIC_MPLAB/p33FJ256GP710.gld
index c5e6cffae0570657747c7955cf8f593075265dbf..637c0995ce9e69d634c824fe8373a03d31e0ce89 100644 (file)
--- a/Demo/dsPIC_MPLAB/p33FJ256GP710.gld
+++ b/Demo/dsPIC_MPLAB/p33FJ256GP710.gld
@@ -3,33 +3,48 @@
 */\r
 \r
 OUTPUT_ARCH("33FJ256GP710")\r
-EXTERN(__resetPRI)\r
-EXTERN(__resetALT)\r
+CRT0_STARTUP(crt0_standard.o)\r
+CRT1_STARTUP(crt1_standard.o)\r
 \r
+OPTIONAL(-lp33FJ256GP710)\r
 \r
 /*\r
 ** Memory Regions\r
 */\r
 MEMORY\r
 {\r
-  data  (a!xr) : ORIGIN = 0x800,         LENGTH = 0x7800\r
-  reset        : ORIGIN = 0x0,           LENGTH = 0x4\r
-  ivt          : ORIGIN = 0x4,           LENGTH = 0xFC\r
-  aivt         : ORIGIN = 0x104,         LENGTH = 0xFC\r
-  program (xr) : ORIGIN = 0x200,         LENGTH = 0x2AA00\r
-  FBS          : ORIGIN = 0xF80000,      LENGTH = 0x2\r
-  FSS          : ORIGIN = 0xF80002,      LENGTH = 0x2\r
-  FGS          : ORIGIN = 0xF80004,      LENGTH = 0x2\r
-  FOSCSEL      : ORIGIN = 0xF80006,      LENGTH = 0x2\r
-  FOSC         : ORIGIN = 0xF80008,      LENGTH = 0x2\r
-  FWDT         : ORIGIN = 0xF8000A,      LENGTH = 0x2\r
-  FPOR         : ORIGIN = 0xF8000C,      LENGTH = 0x2\r
-  CONFIG3      : ORIGIN = 0xF8000E,      LENGTH = 0x2\r
-  FUID0        : ORIGIN = 0xF80010,      LENGTH = 0x2\r
-  FUID1        : ORIGIN = 0xF80012,      LENGTH = 0x2\r
-  FUID2        : ORIGIN = 0xF80014,      LENGTH = 0x2\r
-  FUID3        : ORIGIN = 0xF80016,      LENGTH = 0x2\r
+  data  (a!xr)   : ORIGIN = 0x800,         LENGTH = 0x7800\r
+  reset          : ORIGIN = 0x0,           LENGTH = 0x4\r
+  ivt            : ORIGIN = 0x4,           LENGTH = 0xFC\r
+  aivt           : ORIGIN = 0x104,         LENGTH = 0xFC\r
+  program (xr)   : ORIGIN = 0x200,         LENGTH = 0x2AA00\r
+  FBS            : ORIGIN = 0xF80000,      LENGTH = 0x2\r
+  FSS            : ORIGIN = 0xF80002,      LENGTH = 0x2\r
+  FGS            : ORIGIN = 0xF80004,      LENGTH = 0x2\r
+  FOSCSEL        : ORIGIN = 0xF80006,      LENGTH = 0x2\r
+  FOSC           : ORIGIN = 0xF80008,      LENGTH = 0x2\r
+  FWDT           : ORIGIN = 0xF8000A,      LENGTH = 0x2\r
+  FPOR           : ORIGIN = 0xF8000C,      LENGTH = 0x2\r
+  FICD           : ORIGIN = 0xF8000E,      LENGTH = 0x2\r
+  FUID0          : ORIGIN = 0xF80010,      LENGTH = 0x2\r
+  FUID1          : ORIGIN = 0xF80012,      LENGTH = 0x2\r
+  FUID2          : ORIGIN = 0xF80014,      LENGTH = 0x2\r
+  FUID3          : ORIGIN = 0xF80016,      LENGTH = 0x2\r
 }\r
+\r
+__FBS = 0xF80000;\r
+__FSS = 0xF80002;\r
+__FGS = 0xF80004;\r
+__FOSCSEL = 0xF80006;\r
+__FOSC = 0xF80008;\r
+__FWDT = 0xF8000A;\r
+__FPOR = 0xF8000C;\r
+__FICD = 0xF8000E;\r
+__FUID0 = 0xF80010;\r
+__FUID1 = 0xF80012;\r
+__FUID2 = 0xF80014;\r
+__FUID3 = 0xF80016;\r
+\r
 __IVT_BASE  = 0x4;\r
 __AIVT_BASE = 0x104;\r
 __DATA_BASE = 0x800;\r
@@ -72,16 +87,65 @@ SECTIONS
 \r
   /*\r
   ** User Code and Library Code\r
+  **\r
+  ** This section must not be assigned to __CODE_BASE,\r
+  ** because CodeGuard(tm) sections may be located there.\r
+  **\r
+  ** Note that input sections *(.text) are not mapped here.\r
+  ** The best-fit allocator locates them, so that .text\r
+  ** may flow around PSV sections as needed.\r
   */\r
-  .text __CODE_BASE :\r
+  .text :\r
   {\r
+        *(.init);\r
+        *(.user_init);\r
         *(.handle);\r
         *(.libc) *(.libm) *(.libdsp);  /* keep together in this order */\r
         *(.lib*);\r
-        *(.text);\r
   } >program\r
 \r
 \r
+  /*\r
+  ** User-Defined Section in Program Memory\r
+  **\r
+  ** note: can specify an address using\r
+  **       the following syntax:\r
+  **\r
+  **       usercode 0x1234 :\r
+  **         {\r
+  **           *(usercode);\r
+  **         } >program\r
+  */\r
+  usercode :\r
+  {\r
+        *(usercode);\r
+  } >program\r
+\r
+\r
+  /*\r
+  ** User-Defined Constants in Program Memory\r
+  **\r
+  ** For PSV type sections, the Load Memory Address (LMA)\r
+  ** should be specified as follows:\r
+  **\r
+  **       userconst : AT(0x1234)\r
+  **         {\r
+  **           *(userconst);\r
+  **         } >program\r
+  **\r
+  ** Note that mapping PSV sections in linker scripts\r
+  ** is not generally recommended.\r
+  **\r
+  ** Because of page alignment restrictions, memory is\r
+  ** often used more efficiently when PSV sections\r
+  ** do not appear in the linker script.\r
+  **\r
+  ** For more information on memory allocation,\r
+  ** please refer to chapter 10, 'Linker Processing'\r
+  ** in the Assembler, Linker manual (DS51317).\r
+  */\r
+\r
+\r
   /*\r
   ** Configuration Words\r
   */\r
@@ -99,6 +163,8 @@ SECTIONS
   { *(__FWDT.sec)    } >FWDT\r
   __FPOR :\r
   { *(__FPOR.sec)    } >FPOR\r
+  __FICD :\r
+  { *(__FICD.sec)    } >FICD\r
   __FUID0 :\r
   { *(__FUID0.sec)    } >FUID0\r
   __FUID1 :\r
@@ -329,7 +395,7 @@ SECTIONS
          ABSOLUTE(__DefaultInterrupt));\r
     LONG( DEFINED(__U2ErrInterrupt)    ? ABSOLUTE(__U2ErrInterrupt)    :\r
          ABSOLUTE(__DefaultInterrupt));\r
-    LONG( DEFINED(__Interrupt68)    ? ABSOLUTE(__Interrupt68)    :\r
+    LONG( DEFINED(__Interrupt67)    ? ABSOLUTE(__Interrupt67)    :\r
          ABSOLUTE(__DefaultInterrupt));\r
     LONG( DEFINED(__DMA6Interrupt)    ? ABSOLUTE(__DMA6Interrupt)    :\r
          ABSOLUTE(__DefaultInterrupt));\r
@@ -665,8 +731,8 @@ SECTIONS
     LONG( DEFINED(__AltU2ErrInterrupt)    ? ABSOLUTE(__AltU2ErrInterrupt)    :\r
          (DEFINED(__U2ErrInterrupt)       ? ABSOLUTE(__U2ErrInterrupt)       :\r
          ABSOLUTE(__DefaultInterrupt)));\r
-    LONG( DEFINED(__AltInterrupt68)    ? ABSOLUTE(__AltInterrupt68)    :\r
-         (DEFINED(__Interrupt68)       ? ABSOLUTE(__Interrupt68)       :\r
+    LONG( DEFINED(__AltInterrupt67)    ? ABSOLUTE(__AltInterrupt67)    :\r
+         (DEFINED(__Interrupt67)       ? ABSOLUTE(__Interrupt67)       :\r
          ABSOLUTE(__DefaultInterrupt)));\r
     LONG( DEFINED(__AltDMA6Interrupt)    ? ABSOLUTE(__AltDMA6Interrupt)    :\r
          (DEFINED(__DMA6Interrupt)       ? ABSOLUTE(__DMA6Interrupt)       :\r
@@ -1188,18 +1254,28 @@ _OC8CON       = 0x1AE;
 _OC8CONbits   = 0x1AE;\r
  I2C1RCV      = 0x200;\r
 _I2C1RCV      = 0x200;\r
+ I2CRCV       = 0x200;\r
+_I2CRCV       = 0x200;\r
  I2C1TRN      = 0x202;\r
 _I2C1TRN      = 0x202;\r
+ I2CTRN       = 0x202;\r
+_I2CTRN       = 0x202;\r
  I2C1BRG      = 0x204;\r
 _I2C1BRG      = 0x204;\r
  I2C1CON      = 0x206;\r
 _I2C1CON      = 0x206;\r
 _I2C1CONbits  = 0x206;\r
+ I2CCON       = 0x206;\r
+_I2CCON       = 0x206;\r
  I2C1STAT     = 0x208;\r
 _I2C1STAT     = 0x208;\r
 _I2C1STATbits = 0x208;\r
+ I2CSTAT      = 0x208;\r
+_I2CSTAT      = 0x208;\r
  I2C1ADD      = 0x20A;\r
 _I2C1ADD      = 0x20A;\r
+ I2CADD       = 0x20A;\r
+_I2CADD       = 0x20A;\r
  I2C1MSK      = 0x20C;\r
 _I2C1MSK      = 0x20C;\r
  I2C2RCV      = 0x210;\r
@@ -1367,6 +1443,8 @@ _LATG         = 0x2E8;
 _LATGbits     = 0x2E8;\r
  ADC1BUF0     = 0x300;\r
 _ADC1BUF0     = 0x300;\r
+ ADCBUF0      = 0x300;\r
+_ADCBUF0      = 0x300;\r
  AD1CON1      = 0x320;\r
 _AD1CON1      = 0x320;\r
 _AD1CON1bits  = 0x320;\r
@@ -1388,6 +1466,8 @@ _AD1PCFGHbits = 0x32A;
  AD1PCFGL     = 0x32C;\r
 _AD1PCFGL     = 0x32C;\r
 _AD1PCFGLbits = 0x32C;\r
+ ADPCFG       = 0x32C;\r
+_ADPCFG       = 0x32C;\r
  AD1CSSH      = 0x32E;\r
 _AD1CSSH      = 0x32E;\r
 _AD1CSSHbits  = 0x32E;\r
@@ -1955,6 +2035,10 @@ _RCONbits     = 0x740;
  OSCCON       = 0x742;\r
 _OSCCON       = 0x742;\r
 _OSCCONbits   = 0x742;\r
+ OSCCONL      = 0x742;\r
+_OSCCONL      = 0x742;\r
+ OSCCONH      = 0x743;\r
+_OSCCONH      = 0x743;\r
  CLKDIV       = 0x744;\r
 _CLKDIV       = 0x744;\r
 _CLKDIVbits   = 0x744;\r
@@ -1984,3 +2068,47 @@ _PMD2bits     = 0x772;
  PMD3         = 0x774;\r
 _PMD3         = 0x774;\r
 _PMD3bits     = 0x774;\r
+/*\r
+** ======= Base Addresses for Various Peripherals ======\r
+*/\r
+\r
+ IC1          = 0x140;\r
+_IC1          = 0x140;\r
+ IC2          = 0x144;\r
+_IC2          = 0x144;\r
+ IC3          = 0x148;\r
+_IC3          = 0x148;\r
+ IC4          = 0x14C;\r
+_IC4          = 0x14C;\r
+ IC5          = 0x150;\r
+_IC5          = 0x150;\r
+ IC6          = 0x154;\r
+_IC6          = 0x154;\r
+ IC7          = 0x158;\r
+_IC7          = 0x158;\r
+ IC8          = 0x15C;\r
+_IC8          = 0x15C;\r
+ OC1          = 0x180;\r
+_OC1          = 0x180;\r
+ OC2          = 0x186;\r
+_OC2          = 0x186;\r
+ OC3          = 0x18C;\r
+_OC3          = 0x18C;\r
+ OC4          = 0x192;\r
+_OC4          = 0x192;\r
+ OC5          = 0x198;\r
+_OC5          = 0x198;\r
+ OC6          = 0x19E;\r
+_OC6          = 0x19E;\r
+ OC7          = 0x1A4;\r
+_OC7          = 0x1A4;\r
+ OC8          = 0x1AA;\r
+_OC8          = 0x1AA;\r
+ SPI1         = 0x240;\r
+_SPI1         = 0x240;\r
+ SPI2         = 0x260;\r
+_SPI2         = 0x260;\r
+ UART1        = 0x220;\r
+_UART1        = 0x220;\r
+ UART2        = 0x230;\r
+_UART2        = 0x230;\r