github-forks
/
FreeRTOS
mirror of https://github.com/FreeRTOS/FreeRTOS.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor updates relating to formatting and comments only.

Browse Source
pull/1/head
Richard Barry 10 years ago
parent a61db8f155
commit 2bf93bf925
11 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File

4
FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/.project
Unescape Escape View File

@ -179,7 +179,7 @@
</matcher> </matcher>
</filter> </filter>
<filter> <filter>
<id>1405341154152</id> <id>1426008785534</id>
<name>src/lwIP_Demo/lwip-1.4.0/src/core</name> <name>src/lwIP_Demo/lwip-1.4.0/src/core</name>
<type>10</type> <type>10</type>
<matcher> <matcher>
@ -188,7 +188,7 @@
</matcher> </matcher>
</filter> </filter>
<filter> <filter>
<id>1405341154162</id> <id>1426008785544</id>
<name>src/lwIP_Demo/lwip-1.4.0/src/core</name> <name>src/lwIP_Demo/lwip-1.4.0/src/core</name>
<type>10</type> <type>10</type>
<matcher> <matcher>

2
FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/lwip_timers.c
Unescape Escape View File

@ -433,7 +433,7 @@ sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg)
} }
if (time_needed == SYS_ARCH_TIMEOUT) { 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 could be fetched. We should now call the timeout handler and
deallocate the memory allocated for the timeout. */ deallocate the memory allocated for the timeout. */
tmptimeout = next_timeout; tmptimeout = next_timeout;

4
FreeRTOS/Demo/MicroBlaze_Kintex7_EthernetLite/RTOSDemo/src/main.c
Unescape Escape View File

@ -306,7 +306,9 @@ extern void vPortTickISR( void *pvUnused );
purpose. */ purpose. */
vPortEnableInterrupt( XPAR_INTC_0_TMRCTR_0_VEC_ID ); 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 ); XTmrCtr_SetHandler( &xTickTimerInstance, ( void * ) vPortTickISR, NULL );
/* Set the correct period for the timer. */ /* Set the correct period for the timer. */

7
FreeRTOS/Source/include/projdefs.h
Unescape Escape View File

@ -87,7 +87,7 @@ typedef void (*TaskFunction_t)( void * );
#define errQUEUE_EMPTY ( ( BaseType_t ) 0 ) #define errQUEUE_EMPTY ( ( BaseType_t ) 0 )
#define errQUEUE_FULL ( ( BaseType_t ) 0 ) #define errQUEUE_FULL ( ( BaseType_t ) 0 )
/* Error definitions. */ /* FreeRTOS error definitions. */
#define errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY ( -1 ) #define errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY ( -1 )
#define errQUEUE_BLOCKED ( -4 ) #define errQUEUE_BLOCKED ( -4 )
#define errQUEUE_YIELD ( -5 ) #define errQUEUE_YIELD ( -5 )
@ -103,6 +103,11 @@ typedef void (*TaskFunction_t)( void * );
#define pdINTEGRITY_CHECK_VALUE 0x5a5a5a5aUL #define pdINTEGRITY_CHECK_VALUE 0x5a5a5a5aUL
#endif #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 */ #endif /* PROJDEFS_H */

3
FreeRTOS/Source/include/task.h
Unescape Escape View File

@ -214,6 +214,7 @@ typedef enum
* \ingroup SchedulerControl * \ingroup SchedulerControl
*/ */
#define taskENTER_CRITICAL() portENTER_CRITICAL() #define taskENTER_CRITICAL() portENTER_CRITICAL()
#define taskENTER_CRITICAL_FROM_ISR( x ) portSET_INTERRUPT_MASK_FROM_ISR( x )
/** /**
* task. h * task. h
@ -228,7 +229,7 @@ typedef enum
* \ingroup SchedulerControl * \ingroup SchedulerControl
*/ */
#define taskEXIT_CRITICAL() portEXIT_CRITICAL() #define taskEXIT_CRITICAL() portEXIT_CRITICAL()
#define taskEXIT_CRITICAL_FROM_ISR() portCLEAR_INTERRUPT_MASK_FROM_ISR()
/** /**
* task. h * task. h
* *

4
FreeRTOS/Source/portable/GCC/MicroBlazeV8/portasm.S
Unescape Escape View File

@ -352,7 +352,7 @@ vPortStartFirstTask:
#if MICROBLAZE_EXCEPTIONS_ENABLED == 1 #if ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 )
.text .text
.align 4 .align 4
@ -364,7 +364,7 @@ vPortExceptionHandlerEntry:
bralid r15, vPortExceptionHandler bralid r15, vPortExceptionHandler
or r0, r0, r0 or r0, r0, r0
#endif /* MICROBLAZE_EXCEPTIONS_ENABLED */ #endif /* ( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) && ( configINSTALL_EXCEPTION_HANDLERS == 1 ) */

5
FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h
Unescape Escape View File

@ -119,20 +119,19 @@ void microblaze_disable_interrupts( void );
void microblaze_enable_interrupts( void ); void microblaze_enable_interrupts( void );
#define portDISABLE_INTERRUPTS() microblaze_disable_interrupts() #define portDISABLE_INTERRUPTS() microblaze_disable_interrupts()
#define portENABLE_INTERRUPTS() microblaze_enable_interrupts() #define portENABLE_INTERRUPTS() microblaze_enable_interrupts()
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Critical section macros. */ /* Critical section macros. */
void vPortEnterCritical( void ); void vPortEnterCritical( void );
void vPortExitCritical( void ); void vPortExitCritical( void );
#define portENTER_CRITICAL() { \ #define portENTER_CRITICAL() { \
extern volatile UBaseType_t uxCriticalNesting; \ extern volatile UBaseType_t uxCriticalNesting; \
microblaze_disable_interrupts(); \ microblaze_disable_interrupts(); \
uxCriticalNesting++; \ uxCriticalNesting++; \
} }
#define portEXIT_CRITICAL() { \ #define portEXIT_CRITICAL() { \
extern volatile UBaseType_t uxCriticalNesting; \ extern volatile UBaseType_t uxCriticalNesting; \
/* Interrupts are disabled, so we can */ \ /* Interrupts are disabled, so we can */ \
/* access the variable directly. */ \ /* access the variable directly. */ \
uxCriticalNesting--; \ uxCriticalNesting--; \

2
FreeRTOS/Source/portable/IAR/ARM_CM4F/port.c
Unescape Escape View File

@ -546,7 +546,7 @@ void xPortSysTickHandler( void )
__weak void vPortSetupTimerInterrupt( void ) __weak void vPortSetupTimerInterrupt( void )
{ {
/* Calculate the constants required to configure the tick interrupt. */ /* 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 ); ulTimerCountsForOneTick = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ );
xMaximumPossibleSuppressedTicks = portMAX_24_BIT_NUMBER / ulTimerCountsForOneTick; xMaximumPossibleSuppressedTicks = portMAX_24_BIT_NUMBER / ulTimerCountsForOneTick;

3
FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
Unescape Escape View File

@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
/* Hardware specifics. */ /* Hardware specifics. */
#define portSTACK_GROWTH ( -1 ) #define portSTACK_GROWTH ( -1 )
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ ) #define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
#define portINLINE __inline
#if defined( __x86_64__) || defined( _M_X64 ) #if defined( __x86_64__) || defined( _M_X64 )
#define portBYTE_ALIGNMENT 8 #define portBYTE_ALIGNMENT 8
@ -174,7 +174,6 @@ void vPortExitCritical( void );
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters ) #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters )
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters ) #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters )
#define portINTERRUPT_YIELD ( 0UL ) #define portINTERRUPT_YIELD ( 0UL )
#define portINTERRUPT_TICK ( 1UL ) #define portINTERRUPT_TICK ( 1UL )

1
FreeRTOS/Source/portable/RVDS/ARM_CM3/port.c
Unescape Escape View File

@ -271,6 +271,7 @@ __asm void prvStartFirstTask( void )
ldr r0, =0xE000ED08 ldr r0, =0xE000ED08
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0] ldr r0, [r0]
/* Set the msp back to the start of the stack. */ /* Set the msp back to the start of the stack. */
msr msp, r0 msr msp, r0
/* Globally enable interrupts. */ /* Globally enable interrupts. */

2
FreeRTOS/Source/tasks.c
Unescape Escape View File

@ -555,7 +555,7 @@ TCB_t * pxNewTCB;
StackType_t *pxTopOfStack; StackType_t *pxTopOfStack;
configASSERT( pxTaskCode ); 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, /* Allocate the memory required by the TCB and stack for the new task,
checking that the allocation was successful. */ checking that the allocation was successful. */

Write Preview
Loading…
Cancel
Save