Update project to use the new asm file for the port yield function, and remove the...

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

diff --git a/Demo/PIC24_MPLAB/RTOSDemo.mcw b/Demo/PIC24_MPLAB/RTOSDemo.mcw
index 61dc2e940e5bdfad3faa94c8b4487bdb46a5ac43..be6548079a4b8bd03604ca1af04e61a8de144855 100644 (file)
Binary files a/Demo/PIC24_MPLAB/RTOSDemo.mcw and b/Demo/PIC24_MPLAB/RTOSDemo.mcw differ

diff --git a/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcp b/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcp
index 82a1d5ad45fd65723087babf0bed5487ff7a3783..3f74120a970486b4c9b8fbad61900ef464a7e7d8 100644 (file)
--- a/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcp
+++ b/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcp
@@ -2,6 +2,7 @@
 magic_cookie={66E99B07-E706-4689-9E80-9B2582898A13}\r
 file_version=1.0\r
 [PATH_INFO]\r
+BuildDirPolicy=BuildDirIsSourceDir\r
 dir_src=\r
 dir_bin=\r
 dir_tmp=\r
@@ -15,6 +16,60 @@ filter_inc=*.h;*.inc
 filter_obj=*.o\r
 filter_lib=*.a\r
 filter_lkr=*.gld\r
+[CAT_SUBFOLDERS]\r
+subfolder_src=\r
+subfolder_inc=\r
+subfolder_obj=\r
+subfolder_lib=\r
+subfolder_lkr=\r
+[FILE_SUBFOLDERS]\r
+file_000=.\r
+file_001=.\r
+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_017=.\r
+file_018=.\r
+file_019=.\r
+file_020=.\r
+file_021=.\r
+file_022=.\r
+[GENERATED_FILES]\r
+file_000=no\r
+file_001=no\r
+file_002=no\r
+file_003=no\r
+file_004=no\r
+file_005=no\r
+file_006=no\r
+file_007=no\r
+file_008=no\r
+file_009=no\r
+file_010=no\r
+file_011=no\r
+file_012=no\r
+file_013=no\r
+file_014=no\r
+file_015=no\r
+file_016=no\r
+file_017=no\r
+file_018=no\r
+file_019=no\r
+file_020=no\r
+file_021=no\r
+file_022=no\r
 [OTHER_FILES]\r
 file_000=no\r
 file_001=no\r
@@ -38,6 +93,7 @@ file_018=no
 file_019=no\r
 file_020=no\r
 file_021=no\r
+file_022=no\r
 [FILE_INFO]\r
 file_000=main.c\r
 file_001=..\..\source\list.c\r
@@ -55,21 +111,27 @@ file_012=..\Common\Minimal\comtest.c
 file_013=serial\serial.c\r
 file_014=timertest.c\r
 file_015=lcd.c\r
-file_016=..\..\source\include\semphr.h\r
-file_017=..\..\source\include\task.h\r
-file_018=..\..\source\include\croutine.h\r
-file_019=..\..\source\include\queue.h\r
-file_020=FreeRTOSConfig.h\r
-file_021=p24FJ128GA010.gld\r
+file_016=C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\MPLAB\PIC24_dsPIC\portasm_PIC24_dsPIC.S\r
+file_017=..\..\source\include\semphr.h\r
+file_018=..\..\source\include\task.h\r
+file_019=..\..\source\include\croutine.h\r
+file_020=..\..\source\include\queue.h\r
+file_021=FreeRTOSConfig.h\r
+file_022=p24FJ128GA010.gld\r
 [SUITE_INFO]\r
 suite_guid={479DDE59-4D56-455E-855E-FFF59A3DB57E}\r
 suite_state=\r
 [TOOL_SETTINGS]\r
 TS{7D9C6ECE-785D-44CB-BA22-17BF2E119622}=-g\r
-TS{25AC22BD-2378-4FDB-BFB6-7345A15512D3}=-g -Wall -DMPLAB_PIC24_PORT -mlarge-code -fomit-frame-pointer -fno-schedule-insns -fno-schedule-insns2\r
+TS{25AC22BD-2378-4FDB-BFB6-7345A15512D3}=-g -Wall -DMPLAB_PIC24_PORT -mlarge-code -O1 -fno-schedule-insns -fno-schedule-insns2\r
 TS{7DAC9A1D-4C45-45D6-B25A-D117C74E8F5A}=--defsym=__ICD2RAM=1 -Map="$(TARGETBASE).map" -o"$(TARGETBASE).$(TARGETSUFFIX)"\r
 TS{509E5861-1E2A-483B-8B6B-CA8DB7F2DD78}=\r
 [INSTRUMENTED_TRACE]\r
 enable=0\r
 transport=0\r
 format=0\r
+[CUSTOM_BUILD]\r
+Pre-Build=\r
+Pre-BuildEnabled=1\r
+Post-Build=\r
+Post-BuildEnabled=1\r

diff --git a/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcs b/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcs
index ad85eb9d54acf03b4de7986a150e4891aa1fa016..d24f9c117e942711d176c6116373db6c96d7a4b2 100644 (file)
--- a/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcs
+++ b/Demo/PIC24_MPLAB/RTOSDemo_PIC24.mcs
@@ -1,3 +1,7 @@
 [Header]\r
 MagicCookie={0b13fe8c-dfe0-40eb-8900-6712719559a7}\r
 Version=1.0\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

diff --git a/Demo/PIC24_MPLAB/serial/serial.c b/Demo/PIC24_MPLAB/serial/serial.c
index cb837eb50053186b9da1c41b0afb046360344b2a..a544b1a91cbb7728fe87c055672abd25c5d2074d 100644 (file)
--- a/Demo/PIC24_MPLAB/serial/serial.c
+++ b/Demo/PIC24_MPLAB/serial/serial.c
@@ -219,7 +219,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 void __attribute__((__interrupt__, auto_psv)) _U2TXInterrupt( void )\r
 {\r
 signed portCHAR cChar;\r
-portBASE_TYPE xTaskWoken = pdFALSE;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        /* If the transmit buffer is full we cannot get the next character.\r
        Another interrupt will occur the next time there is space so this does\r
@@ -227,7 +227,7 @@ portBASE_TYPE xTaskWoken = pdFALSE;
        IFS1bits.U2TXIF = serCLEAR_FLAG;\r
        while( !( U2STAbits.UTXBF ) )\r
        {\r
-               if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWoken ) == pdTRUE )\r
+               if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )\r
                {\r
                        /* Send the next character queued for Tx. */\r
                        U2TXREG = cChar;\r
@@ -240,7 +240,7 @@ portBASE_TYPE xTaskWoken = pdFALSE;
                }\r
        }\r
 \r
-       if( xTaskWoken != pdFALSE )\r
+       if( xHigherPriorityTaskWoken != pdFALSE )\r
        {\r
                taskYIELD();\r
        }\r