Kernel changes:

[freertos] / FreeRTOS / Source / portable / RVDS / ARM_CM4F / port.c

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
index 543aa00dda43d7dfd6058e0e95800934078426ec..67868224ba818e2822cf7d29d9711a553b69ef07 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/port.c
@@ -114,6 +114,12 @@ is defined. */
 #define portNVIC_PENDSVCLEAR_BIT                       ( 1UL << 27UL )\r
 #define portNVIC_PEND_SYSTICK_CLEAR_BIT                ( 1UL << 25UL )\r
 \r
+/* Constants used to detect a Cortex-M7 r0p1 core, which should use the ARM_CM7\r
+r0p1 port. */\r
+#define portCPUID                                                      ( * ( ( volatile uint32_t * ) 0xE000ed00 ) )\r
+#define portCORTEX_M7_r0p1_ID                          ( 0x410FC271UL )\r
+#define portCORTEX_M7_r0p0_ID                          ( 0x410FC270UL )\r
+\r
 #define portNVIC_PENDSV_PRI                                    ( ( ( uint32_t ) configKERNEL_INTERRUPT_PRIORITY ) << 16UL )\r
 #define portNVIC_SYSTICK_PRI                           ( ( ( uint32_t ) configKERNEL_INTERRUPT_PRIORITY ) << 24UL )\r
 \r
@@ -325,6 +331,16 @@ __asm void prvEnableVFP( void )
  */\r
 BaseType_t xPortStartScheduler( void )\r
 {\r
+       /* configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to 0.\r
+       See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */\r
+       configASSERT( configMAX_SYSCALL_INTERRUPT_PRIORITY );\r
+\r
+       /* This port can be used on all revisions of the Cortex-M7 core other than\r
+       the r0p1 parts.  r0p1 parts should use the port from the\r
+       /source/portable/GCC/ARM_CM7/r0p1 directory. */\r
+       configASSERT( portCPUID != portCORTEX_M7_r0p1_ID );\r
+       configASSERT( portCPUID != portCORTEX_M7_r0p0_ID );\r
+\r
        #if( configASSERT_DEFINED == 1 )\r
        {\r
                volatile uint32_t ulOriginalPriority;\r
@@ -346,6 +362,10 @@ BaseType_t xPortStartScheduler( void )
                /* Read the value back to see how many bits stuck. */\r
                ucMaxPriorityValue = *pucFirstUserPriorityRegister;\r
 \r
+               /* The kernel interrupt priority should be set to the lowest\r
+               priority. */\r
+               configASSERT( ucMaxPriorityValue == ( configKERNEL_INTERRUPT_PRIORITY & ucMaxPriorityValue ) );\r
+\r
                /* Use the same mask on the maximum system call priority. */\r
                ucMaxSysCallPriority = configMAX_SYSCALL_INTERRUPT_PRIORITY & ucMaxPriorityValue;\r
 \r
@@ -489,7 +509,6 @@ __asm void xPortPendSVHandler( void )
        #endif\r
 \r
        bx r14\r
-       nop\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r