From 082624f1a435c8c703a8384adb17e4d7ba4f4e9c Mon Sep 17 00:00:00 2001 From: rtel Date: Fri, 20 Mar 2015 15:43:20 +0000 Subject: [PATCH] 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 --- FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project | 4 ++-- .../Demo/Common/ethernet/lwip-1.4.0/src/core/lwip_timers.c | 2 +- .../MicroBlaze_Kintex7_EthernetLite/RTOSDemo/src/main.c | 4 +++- FreeRTOS/Source/include/projdefs.h | 7 ++++++- FreeRTOS/Source/include/task.h | 5 +++-- FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S | 4 ++-- FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h | 5 ++--- FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c | 2 +- FreeRTOS/Source/portable/MSVC-MingW/portmacro.h | 3 +-- FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c | 1 + FreeRTOS/Source/tasks.c | 2 +- 11 files changed, 23 insertions(+), 16 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project index 9e078008b..bcdae3f4d 100644 --- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project +++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project @@ -179,7 +179,7 @@ - 1405341154152 + 1426008785534 src/lwIP_Demo/lwip-1.4.0/src/core 10 @@ -188,7 +188,7 @@ - 1405341154162 + 1426008785544 src/lwIP_Demo/lwip-1.4.0/src/core 10 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 f0e92cceb..dfed0bcb1 100644 --- 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 2f967482f..12ee2c668 100644 --- 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. */ vPortEnableInterrupt( XPAR_INTC_0_TMRCTR_0_VEC_ID ); - /* Configure the timer interrupt handler. */ + /* Configure the timer interrupt handler. This installs the handler + directly, rather than through the Xilinx driver. This is done for + efficiency. */ XTmrCtr_SetHandler( &xTickTimerInstance, ( void * ) vPortTickISR, NULL ); /* Set the correct period for the timer. */ diff --git a/FreeRTOS/Source/include/projdefs.h b/FreeRTOS/Source/include/projdefs.h index db30b34be..f3c369939 100644 --- 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 ) #define errQUEUE_FULL ( ( BaseType_t ) 0 ) -/* Error definitions. */ +/* FreeRTOS error definitions. */ #define errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY ( -1 ) #define errQUEUE_BLOCKED ( -4 ) #define errQUEUE_YIELD ( -5 ) @@ -103,6 +103,11 @@ typedef void (*TaskFunction_t)( void * ); #define pdINTEGRITY_CHECK_VALUE 0x5a5a5a5aUL #endif +/* The following endian values are used by FreeRTOS+ components, not FreeRTOS +itself. */ +#define pdFREERTOS_LITTLE_ENDIAN 0 +#define pdFREERTOS_BIG_ENDIAN 1 + #endif /* PROJDEFS_H */ diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h index 77e9eb6be..3f1e8b87a 100644 --- a/FreeRTOS/Source/include/task.h +++ b/FreeRTOS/Source/include/task.h @@ -214,6 +214,7 @@ typedef enum * \ingroup SchedulerControl */ #define taskENTER_CRITICAL() portENTER_CRITICAL() +#define taskENTER_CRITICAL_FROM_ISR( x ) portSET_INTERRUPT_MASK_FROM_ISR( x ) /** * task. h @@ -228,7 +229,7 @@ typedef enum * \ingroup SchedulerControl */ #define taskEXIT_CRITICAL() portEXIT_CRITICAL() - +#define taskEXIT_CRITICAL_FROM_ISR() portCLEAR_INTERRUPT_MASK_FROM_ISR() /** * task. h * @@ -1164,7 +1165,7 @@ constant. */ configNUM_THREAD_LOCAL_STORAGE_POINTERS setting in FreeRTOSConfig.h. The kernel does not use the pointers itself, so the application writer can use the pointers for any purpose they wish. The following two functions are - used to set and query a pointer respectively. */ + used to set and query a pointer respectively. */ void vTaskSetThreadLocalStoragePointer( TaskHandle_t xTaskToSet, BaseType_t xIndex, void *pvValue ); void *pvTaskGetThreadLocalStoragePointer( TaskHandle_t xTaskToQuery, BaseType_t xIndex ); diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S index b1750d964..adbe3ec37 100644 --- a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S +++ b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S @@ -352,7 +352,7 @@ vPortStartFirstTask: -#if MICROBLAZE_EXCEPTIONS_ENABLED == 1 +#if ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 ) .text .align 4 @@ -364,7 +364,7 @@ vPortExceptionHandlerEntry: bralid r15, vPortExceptionHandler or r0, r0, r0 -#endif /* MICROBLAZE_EXCEPTIONS_ENABLED */ +#endif /* ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 ) */ diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h index b4d530319..a44024ca2 100644 --- 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 ); #define portDISABLE_INTERRUPTS() microblaze_disable_interrupts() #define portENABLE_INTERRUPTS() microblaze_enable_interrupts() - /*-----------------------------------------------------------*/ /* Critical section macros. */ void vPortEnterCritical( void ); void vPortExitCritical( void ); #define portENTER_CRITICAL() { \ - extern volatile UBaseType_t uxCriticalNesting; \ + extern volatile UBaseType_t uxCriticalNesting; \ microblaze_disable_interrupts(); \ uxCriticalNesting++; \ } #define portEXIT_CRITICAL() { \ - extern volatile UBaseType_t uxCriticalNesting; \ + extern volatile UBaseType_t uxCriticalNesting; \ /* Interrupts are disabled, so we can */ \ /* access the variable directly. */ \ uxCriticalNesting--; \ diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c index 9487a8bee..6cc4cfca6 100644 --- 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 ) { /* Calculate the constants required to configure the tick interrupt. */ - #if configUSE_TICKLESS_IDLE == 1 + #if( configUSE_TICKLESS_IDLE == 1 ) { ulTimerCountsForOneTick = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ); xMaximumPossibleSuppressedTicks = portMAX_24_BIT_NUMBER / ulTimerCountsForOneTick; diff --git a/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h b/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h index c0a287558..121c6efbc 100644 --- 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. */ #define portSTACK_GROWTH ( -1 ) #define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ ) - +#define portINLINE __inline #if defined( __x86_64__) || defined( _M_X64 ) #define portBYTE_ALIGNMENT 8 @@ -174,7 +174,6 @@ void vPortExitCritical( void ); #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters ) - #define portINTERRUPT_YIELD ( 0UL ) #define portINTERRUPT_TICK ( 1UL ) diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c b/FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c index 2588d6c9d..6139019c7 100644 --- 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 ldr r0, [r0] ldr r0, [r0] + /* Set the msp back to the start of the stack. */ msr msp, r0 /* Globally enable interrupts. */ diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c index 822338df1..edfda8093 100644 --- a/FreeRTOS/Source/tasks.c +++ b/FreeRTOS/Source/tasks.c @@ -555,7 +555,7 @@ TCB_t * pxNewTCB; StackType_t *pxTopOfStack; configASSERT( pxTaskCode ); - configASSERT( ( ( uxPriority & ( ~portPRIVILEGE_BIT ) ) < configMAX_PRIORITIES ) ); + configASSERT( ( ( uxPriority & ( UBaseType_t ) ( ~portPRIVILEGE_BIT ) ) < ( UBaseType_t ) configMAX_PRIORITIES ) ); /* Allocate the memory required by the TCB and stack for the new task, checking that the allocation was successful. */ -- 2.39.5