Update PIC32 demo application to remove reliance on PLIB functions.

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CM3 / port.c

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
index 286b19ac4b7102f6c5dd5e258c1fae8913680fa9..45dcebec5425849b6a6b60c881470df0ac8a8ee5 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
@@ -391,19 +391,28 @@ void xPortSysTickHandler( void )
                kernel with respect to calendar time. */\r
                portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
 \r
-               /* If a context switch is pending then abandon the low power entry as\r
-               the context switch might have been pended by an external interrupt that\r
-               requires processing. */\r
-               if( ( portNVIC_INT_CTRL_REG & portNVIC_PENDSVSET_BIT ) != 0 )\r
+               /* Adjust the reload value to take into account that the current time\r
+               slice is already partially complete. */\r
+               ulReloadValue += ( portNVIC_SYSTICK_LOAD_REG - ( portNVIC_SYSTICK_LOAD_REG - portNVIC_SYSTICK_CURRENT_VALUE_REG ) );\r
+\r
+               /* Enter a critical section but don't use the taskENTER_CRITICAL()\r
+               method as that will mask interrupts that should exit sleep mode. */\r
+               __asm volatile( "cpsid i" );\r
+\r
+               /* If a context switch is pending or a task is waiting for the scheduler\r
+               to be unsuspended then abandon the low power entry. */\r
+               if( eTaskConfirmSleepModeStatus() == eAbortSleep )\r
                {\r
                        /* Restart SysTick. */\r
                        portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;\r
+\r
+                       /* Re-enable interrupts - see comments above the cpsid instruction()\r
+                       above. */\r
+                       __asm volatile( "cpsie i" );\r
                }\r
                else\r
                {\r
-                       /* Adjust the reload value to take into account that the current\r
-                       time slice is already partially complete. */\r
-                       ulReloadValue += ( portNVIC_SYSTICK_LOAD_REG - ( portNVIC_SYSTICK_LOAD_REG - portNVIC_SYSTICK_CURRENT_VALUE_REG ) );\r
+                       /* Set the new reload value. */\r
                        portNVIC_SYSTICK_LOAD_REG = ulReloadValue;\r
 \r
                        /* Clear the SysTick count flag and set the count value back to\r
@@ -432,6 +441,10 @@ void xPortSysTickHandler( void )
                        kernel with respect to calendar time. */\r
                        portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT;\r
 \r
+                       /* Re-enable interrupts - see comments above the cpsid instruction()\r
+                       above. */\r
+                       __asm volatile( "cpsie i" );\r
+\r
                        if( ( portNVIC_SYSTICK_CTRL_REG & portNVIC_SYSTICK_COUNT_FLAG_BIT ) != 0 )\r
                        {\r
                                /* The tick interrupt has already executed, and the SysTick\r