Change to use interrupt priority definitions that use shifted values from 0 to 7...

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

diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 88f6a9e5cd9f4e79b0ab946e343228f4435558a1..cc7d529956b60848eab55e58c86fa26fee8f5644 100644 (file)
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -67,7 +67,7 @@
 #define configUSE_TICK_HOOK                            1\r
 #define configCPU_CLOCK_HZ                             ( ( unsigned portLONG ) 50000000 )\r
 #define configTICK_RATE_HZ                             ( ( portTickType ) 1000 )\r
-#define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 60 )\r
+#define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 80 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 24000 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 12 )\r
 #define configUSE_TRACE_FACILITY               1\r
@@ -96,8 +96,8 @@ to exclude the API function. */
 \r
 \r
 \r
-#define configKERNEL_INTERRUPT_PRIORITY                255\r
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY   191 /* equivalent to 0xa0, or priority 5. */\r
+#define configKERNEL_INTERRUPT_PRIORITY                ( ( unsigned portCHAR ) 7 << ( unsigned portCHAR ) 5 )  /* Priority 7, or 255 as only the top three bits are implemented.  This is the lowest priority. */\r
+#define configMAX_SYSCALL_INTERRUPT_PRIORITY   ( ( unsigned portCHAR ) 5 << ( unsigned portCHAR ) 5 )  /* Priority 5, or 160 as only the top three bits are implemented. */\r
 \r
 \r
 #endif /* FREERTOS_CONFIG_H */\r

diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c
index 92392a6b59f5dd918d643c8804836858346321c7..bd6e6e050132e3c2e71abfbcb053e5bb8e7f9378 100644 (file)
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c
@@ -77,7 +77,7 @@ unsigned long ulFrequency;
        \r
        /* Set the timer interrupts to be above the kernel.  The interrupts are\r
         assigned different priorities so they nest with each other. */\r
-       IntPrioritySet( INT_TIMER2A, configMAX_SYSCALL_INTERRUPT_PRIORITY - 1 );\r
+       IntPrioritySet( INT_TIMER2A, configMAX_SYSCALL_INTERRUPT_PRIORITY + ( 1 << 5 ) ); /* Shift left 5 as only the top 3 bits are implemented. */\r
        IntPrioritySet( INT_TIMER3A, configMAX_SYSCALL_INTERRUPT_PRIORITY );\r
 \r
        /* Ensure interrupts do not start until the scheduler is running. */\r

diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c
index 8e2092ce66ff88d19a715e08e5039d07bb2a3464..cd61b06ea90e124d77b5e895e833e832b517e0f3 100644 (file)
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c
@@ -261,6 +261,7 @@ int main( void )
 \r
     /* Will only get here if there was insufficient memory to create the idle\r
     task. */\r
+       for( ;; );\r
        return 0;\r
 }\r
 /*-----------------------------------------------------------*/\r