Tidy up only.

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

diff --git a/Source/include/mpu_wrappers.h b/Source/include/mpu_wrappers.h
index 49bf7a183ef43a41a526475405193367e29ab979..7b44c260a1fd139edc248a42b783e0b359bd96a5 100644 (file)
--- a/Source/include/mpu_wrappers.h
+++ b/Source/include/mpu_wrappers.h
@@ -94,14 +94,17 @@ only for ports that are using the MPU. */
                #define xQueueGenericReceive                    MPU_xQueueGenericReceive\r
                #define uxQueueMessagesWaiting                  MPU_uxQueueMessagesWaiting\r
                #define vQueueDelete                                    MPU_vQueueDelete\r
-               #define vQueueAddToRegistry                             MPU_vQueueAddToRegistry\r
-               #define vQueueUnregisterQueue                   MPU_vQueueUnregisterQueue\r
 \r
                #define pvPortMalloc                                    MPU_pvPortMalloc\r
                #define vPortFree                                               MPU_vPortFree\r
                #define xPortGetFreeHeapSize                    MPU_xPortGetFreeHeapSize\r
                #define vPortInitialiseBlocks                   MPU_vPortInitialiseBlocks\r
 \r
+               #if configQUEUE_REGISTRY_SIZE > 0\r
+                       #define vQueueAddToRegistry                             MPU_vQueueAddToRegistry\r
+                       #define vQueueUnregisterQueue                   MPU_vQueueUnregisterQueue\r
+               #endif\r
+\r
                /* Remove the privileged function macro. */\r
                #define PRIVILEGED_FUNCTION\r
 \r

diff --git a/Source/portable/GCC/ARM_CM3_MPU/port.c b/Source/portable/GCC/ARM_CM3_MPU/port.c
index 93caade95713cb6c2a7eabe73ece1f0472b95680..d4a662e2c4e50c456d2a7ebf1847d691011e7dd4 100644 (file)
--- a/Source/portable/GCC/ARM_CM3_MPU/port.c
+++ b/Source/portable/GCC/ARM_CM3_MPU/port.c
@@ -91,7 +91,6 @@ task.h is included from an application file. */
 #define portNVIC_PENDSV_PRI                                            ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 16UL )\r
 #define portNVIC_SYSTICK_PRI                                   ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 24UL )\r
 #define portNVIC_SVC_PRI                                               ( ( ( unsigned long ) configKERNEL_INTERRUPT_PRIORITY ) << 24UL )\r
-#define portNVIC_TEMP_SVC_PRI                                  ( 0x01UL << 24UL )\r
 \r
 /* Constants required to set up the initial stack. */\r
 #define portINITIAL_XPSR                                               ( 0x01000000 )\r
@@ -270,10 +269,9 @@ static void prvRestoreContextOfFirstTask( void )
  */\r
 portBASE_TYPE xPortStartScheduler( void )\r
 {\r
-       /* Make PendSV, CallSV and SysTick the same priroity as the kernel. */\r
+       /* Make PendSV and SysTick the same priroity as the kernel. */\r
        *(portNVIC_SYSPRI2) |= portNVIC_PENDSV_PRI;\r
        *(portNVIC_SYSPRI2) |= portNVIC_SYSTICK_PRI;\r
-    *(portNVIC_SYSPRI1) |= portNVIC_TEMP_SVC_PRI;\r
 \r
        /* Configure the regions in the MPU that are common to all tasks. */\r
        prvSetupMPU();\r