Added: /* This is called from the context switch, so will be called from a

	critical section.  xTaskGetTickCountFromISR() contains its own critical
	section, and the ISR safe critical sections are not designed to nest,
	so reset the critical section. */
	portSET_INTERRUPT_MASK_FROM_ISR();

in main.c.

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

diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c b/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c
index c71065e3cfe2d3388d6f02c9e4723d358c899edf..19cfa685ba3472b6e562ee373adc7b2bf5d5d9f2 100644 (file)
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c
@@ -624,6 +624,12 @@ const unsigned long ulSysTickPendingBit = 0x04000000UL;
        \r
        /* How many times has it overflowed? */\r
        ulTickCount = xTaskGetTickCountFromISR();\r
+\r
+       /* This is called from the context switch, so will be called from a\r
+       critical section.  xTaskGetTickCountFromISR() contains its own critical\r
+       section, and the ISR safe critical sections are not designed to nest,\r
+       so reset the critical section. */\r
+       portSET_INTERRUPT_MASK_FROM_ISR();\r
        \r
        /* Is there a SysTick interrupt pending? */\r
        if( ( *pulInterruptCTRLState & ulSysTickPendingBit ) != 0UL )\r