Minor updates relating to formatting and comments only.

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

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project
index 9e078008b943290d42464e062b9a201a3f5d5ac1..bcdae3f4d25ec64d6530b004792ab4ab8cf2165d 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project
@@ -179,7 +179,7 @@
                        </matcher>\r
                </filter>\r
                <filter>\r
-                       <id>1405341154152</id>\r
+                       <id>1426008785534</id>\r
                        <name>src/lwIP_Demo/lwip-1.4.0/src/core</name>\r
                        <type>10</type>\r
                        <matcher>\r
@@ -188,7 +188,7 @@
                        </matcher>\r
                </filter>\r
                <filter>\r
-                       <id>1405341154162</id>\r
+                       <id>1426008785544</id>\r
                        <name>src/lwIP_Demo/lwip-1.4.0/src/core</name>\r
                        <type>10</type>\r
                        <matcher>\r

diff --git a/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/lwip_timers.c b/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/lwip_timers.c
index f0e92ccebe79e3b018c2287b0cd1a479d4f5776f..dfed0bcb1b8fe6593083c518abed43d8a5ebd8c5 100644 (file)
--- a/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/lwip_timers.c
+++ b/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/lwip_timers.c
@@ -433,7 +433,7 @@ sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg)
     }
 
     if (time_needed == SYS_ARCH_TIMEOUT) {
-      /* If time == SYS_ARCH_TIMEOUT, a timeout occured before a message
+      /* If time == SYS_ARCH_TIMEOUT, a timeout occurred before a message
          could be fetched. We should now call the timeout handler and
          deallocate the memory allocated for the timeout. */
       tmptimeout = next_timeout;

diff --git a/FreeRTOS/Demo/MicroBlaze_Kintex7_EthernetLite/RTOSDemo/src/main.c b/FreeRTOS/Demo/MicroBlaze_Kintex7_EthernetLite/RTOSDemo/src/main.c
index 2f967482f2f28a79356bc7a498534c376d155a12..12ee2c668927b418705737620e4e73b2bcdf3c94 100644 (file)
--- a/FreeRTOS/Demo/MicroBlaze_Kintex7_EthernetLite/RTOSDemo/src/main.c
+++ b/FreeRTOS/Demo/MicroBlaze_Kintex7_EthernetLite/RTOSDemo/src/main.c
@@ -306,7 +306,9 @@ extern void vPortTickISR( void *pvUnused );
                purpose. */\r
                vPortEnableInterrupt( XPAR_INTC_0_TMRCTR_0_VEC_ID );\r
 \r
-               /* Configure the timer interrupt handler. */\r
+               /* Configure the timer interrupt handler.  This installs the handler\r
+               directly, rather than through the Xilinx driver.  This is done for\r
+               efficiency. */\r
                XTmrCtr_SetHandler( &xTickTimerInstance, ( void * ) vPortTickISR, NULL );\r
 \r
                /* Set the correct period for the timer. */\r

diff --git a/FreeRTOS/Source/include/projdefs.h b/FreeRTOS/Source/include/projdefs.h
index db30b34be4dd6e9ff508c275a4468324bbe16e64..f3c3699398167d9f877aab2c1fd1230315b340b1 100644 (file)
--- a/FreeRTOS/Source/include/projdefs.h
+++ b/FreeRTOS/Source/include/projdefs.h
@@ -87,7 +87,7 @@ typedef void (*TaskFunction_t)( void * );
 #define errQUEUE_EMPTY ( ( BaseType_t ) 0 )\r
 #define errQUEUE_FULL  ( ( BaseType_t ) 0 )\r
 \r
-/* Error definitions. */\r
+/* FreeRTOS error definitions. */\r
 #define errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY  ( -1 )\r
 #define errQUEUE_BLOCKED                                               ( -4 )\r
 #define errQUEUE_YIELD                                                 ( -5 )\r
@@ -103,6 +103,11 @@ typedef void (*TaskFunction_t)( void * );
        #define pdINTEGRITY_CHECK_VALUE 0x5a5a5a5aUL\r
 #endif\r
 \r
+/* The following endian values are used by FreeRTOS+ components, not FreeRTOS\r
+itself. */\r
+#define pdFREERTOS_LITTLE_ENDIAN       0\r
+#define pdFREERTOS_BIG_ENDIAN          1\r
+\r
 #endif /* PROJDEFS_H */\r
 \r
 \r

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index 77e9eb6be3175d95026a6a35a4cc7be1db0700af..3f1e8b87a44747c68cc6a28c46a83b6336dd1d77 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -214,6 +214,7 @@ typedef enum
  * \ingroup SchedulerControl\r
  */\r
 #define taskENTER_CRITICAL()           portENTER_CRITICAL()\r
+#define taskENTER_CRITICAL_FROM_ISR( x ) portSET_INTERRUPT_MASK_FROM_ISR( x )\r
 \r
 /**\r
  * task. h\r
@@ -228,7 +229,7 @@ typedef enum
  * \ingroup SchedulerControl\r
  */\r
 #define taskEXIT_CRITICAL()                    portEXIT_CRITICAL()\r
-\r
+#define taskEXIT_CRITICAL_FROM_ISR() portCLEAR_INTERRUPT_MASK_FROM_ISR()\r
 /**\r
  * task. h\r
  *\r
@@ -1164,7 +1165,7 @@ constant. */
        configNUM_THREAD_LOCAL_STORAGE_POINTERS setting in FreeRTOSConfig.h.  The\r
        kernel does not use the pointers itself, so the application writer can use\r
        the pointers for any purpose they wish.  The following two functions are\r
-       used to set and query a pointer respectively. */        \r
+       used to set and query a pointer respectively. */\r
        void vTaskSetThreadLocalStoragePointer( TaskHandle_t xTaskToSet, BaseType_t xIndex, void *pvValue );\r
        void *pvTaskGetThreadLocalStoragePointer( TaskHandle_t xTaskToQuery, BaseType_t xIndex );\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S
index b1750d964efd8b41f668289c0eb2e8d3f153f85e..adbe3ec378cd1ac310dcdbd241234f5e45a1657b 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S
+++ b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S
@@ -352,7 +352,7 @@ vPortStartFirstTask:
 \r
 \r
 \r
-#if MICROBLAZE_EXCEPTIONS_ENABLED == 1\r
+#if ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 )\r
 \r
        .text\r
        .align 4\r
@@ -364,7 +364,7 @@ vPortExceptionHandlerEntry:
        bralid r15, vPortExceptionHandler\r
        or r0, r0, r0\r
 \r
-#endif /* MICROBLAZE_EXCEPTIONS_ENABLED */\r
+#endif /* ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 ) */\r
 \r
 \r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h
index b4d530319698ecad363fbbfc7ed9404904b29f33..a44024ca244fff4a717fe1d4d46d4087ed543580 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h
@@ -119,20 +119,19 @@ void microblaze_disable_interrupts( void );
 void microblaze_enable_interrupts( void );\r
 #define portDISABLE_INTERRUPTS()       microblaze_disable_interrupts()\r
 #define portENABLE_INTERRUPTS()                microblaze_enable_interrupts()\r
-\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section macros. */\r
 void vPortEnterCritical( void );\r
 void vPortExitCritical( void );\r
 #define portENTER_CRITICAL()           {                                                                                                                               \\r
-                                                                               extern volatile UBaseType_t uxCriticalNesting;  \\r
+                                                                               extern volatile UBaseType_t uxCriticalNesting;                          \\r
                                                                                microblaze_disable_interrupts();                                                        \\r
                                                                                uxCriticalNesting++;                                                                            \\r
                                                                        }\r
 \r
 #define portEXIT_CRITICAL()                    {                                                                                                                               \\r
-                                                                               extern volatile UBaseType_t uxCriticalNesting;  \\r
+                                                                               extern volatile UBaseType_t uxCriticalNesting;                          \\r
                                                                                /* Interrupts are disabled, so we can */                                        \\r
                                                                                /* access the variable directly. */                                                     \\r
                                                                                uxCriticalNesting--;                                                                            \\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
index 9487a8bee459904e18188c0e96b8fe744f940fdd..6cc4cfca661ed7ee0e112e8017bf8112c2910f3e 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
@@ -546,7 +546,7 @@ void xPortSysTickHandler( void )
 __weak void vPortSetupTimerInterrupt( void )\r
 {\r
        /* Calculate the constants required to configure the tick interrupt. */\r
-       #if configUSE_TICKLESS_IDLE == 1\r
+       #if( configUSE_TICKLESS_IDLE == 1 )\r
        {\r
                ulTimerCountsForOneTick = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ );\r
                xMaximumPossibleSuppressedTicks = portMAX_24_BIT_NUMBER / ulTimerCountsForOneTick;\r

diff --git a/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h b/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
index c0a287558ced4e9c39c3ebfab50fd1af546c7b50..121c6efbc666e1207a6d55a16e7d61a8e69beb1a 100644 (file)
--- a/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
+++ b/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
 #define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
-\r
+#define portINLINE __inline\r
 \r
 #if defined( __x86_64__) || defined( _M_X64 )\r
        #define portBYTE_ALIGNMENT              8\r
@@ -174,7 +174,6 @@ void vPortExitCritical( void );
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters )\r
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters )\r
 \r
-\r
 #define portINTERRUPT_YIELD                            ( 0UL )\r
 #define portINTERRUPT_TICK                             ( 1UL )\r
 \r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
index 2588d6c9def6c2642843cd213f2badf999bec5bc..6139019c7f8a514d2b68fa433c4cd91ee47a544e 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
@@ -271,6 +271,7 @@ __asm void prvStartFirstTask( void )
        ldr r0, =0xE000ED08\r
        ldr r0, [r0]\r
        ldr r0, [r0]\r
+\r
        /* Set the msp back to the start of the stack. */\r
        msr msp, r0\r
        /* Globally enable interrupts. */\r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index 822338df1d1f4117fbaf5ed50b15fc1d2ac4cfde..edfda8093b978ebe295407af186a8b87f58003e6 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -555,7 +555,7 @@ TCB_t * pxNewTCB;
 StackType_t *pxTopOfStack;\r
 \r
        configASSERT( pxTaskCode );\r
-       configASSERT( ( ( uxPriority & ( ~portPRIVILEGE_BIT ) ) < configMAX_PRIORITIES ) );\r
+       configASSERT( ( ( uxPriority & ( UBaseType_t ) ( ~portPRIVILEGE_BIT ) ) < ( UBaseType_t ) configMAX_PRIORITIES ) );\r
 \r
        /* Allocate the memory required by the TCB and stack for the new task,\r
        checking that the allocation was successful. */\r