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

[freertos] / Demo / PIC24_MPLAB / serial / serial.c

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