mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-08-19 09:38:32 -04:00
Replace standard types with stdint.h types.
Replace #define types with typedefs. Rename all typedefs to have a _t extension. Add #defines to automatically convert old FreeRTOS specific types to their new names (with the _t).
This commit is contained in:
Richard Barry
parent
f292243dcf
commit
3e20aa7d60
190 changed files with 4940 additions and 4603 deletions
|
|
@ -72,95 +72,95 @@
|
|||
|
||||
/* Critical nesting should be initialised to a non zero value so interrupts don't
|
||||
accidentally get enabled before the scheduler is started. */
|
||||
#define portINITIAL_CRITICAL_NESTING (( portSTACK_TYPE ) 10)
|
||||
#define portINITIAL_CRITICAL_NESTING (( StackType_t ) 10)
|
||||
|
||||
/* The PSW value assigned to tasks when they start to run for the first time. */
|
||||
#define portPSW (( portSTACK_TYPE ) 0x00000000)
|
||||
#define portPSW (( StackType_t ) 0x00000000)
|
||||
|
||||
/* We require the address of the pxCurrentTCB variable, but don't want to know
|
||||
any details of its type. */
|
||||
typedef void tskTCB;
|
||||
extern volatile tskTCB * volatile pxCurrentTCB;
|
||||
typedef void TCB_t;
|
||||
extern volatile TCB_t * volatile pxCurrentTCB;
|
||||
|
||||
/* Keeps track of the nesting level of critical sections. */
|
||||
volatile portSTACK_TYPE usCriticalNesting = portINITIAL_CRITICAL_NESTING;
|
||||
volatile StackType_t usCriticalNesting = portINITIAL_CRITICAL_NESTING;
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* Sets up the timer to generate the tick interrupt. */
|
||||
static void prvSetupTimerInterrupt( void );
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )
|
||||
StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )
|
||||
{
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) pxCode; /* Task function start address */
|
||||
*pxTopOfStack = ( StackType_t ) pxCode; /* Task function start address */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) pxCode; /* Task function start address */
|
||||
*pxTopOfStack = ( StackType_t ) pxCode; /* Task function start address */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = portPSW; /* Initial PSW value */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x20202020; /* Initial Value of R20 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x20202020; /* Initial Value of R20 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x21212121; /* Initial Value of R21 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x21212121; /* Initial Value of R21 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x22222222; /* Initial Value of R22 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x22222222; /* Initial Value of R22 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x23232323; /* Initial Value of R23 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x23232323; /* Initial Value of R23 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x24242424; /* Initial Value of R24 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x24242424; /* Initial Value of R24 */
|
||||
pxTopOfStack--;
|
||||
#if (__DATA_MODEL__ == 0) || (__DATA_MODEL__ == 1)
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x25252525; /* Initial Value of R25 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x25252525; /* Initial Value of R25 */
|
||||
pxTopOfStack--;
|
||||
#endif /* configDATA_MODE */
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x26262626; /* Initial Value of R26 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x26262626; /* Initial Value of R26 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x27272727; /* Initial Value of R27 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x27272727; /* Initial Value of R27 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x28282828; /* Initial Value of R28 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x28282828; /* Initial Value of R28 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x29292929; /* Initial Value of R29 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x29292929; /* Initial Value of R29 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x30303030; /* Initial Value of R30 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x30303030; /* Initial Value of R30 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x19191919; /* Initial Value of R19 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x19191919; /* Initial Value of R19 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x18181818; /* Initial Value of R18 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x18181818; /* Initial Value of R18 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x17171717; /* Initial Value of R17 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x17171717; /* Initial Value of R17 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x16161616; /* Initial Value of R16 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x16161616; /* Initial Value of R16 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x15151515; /* Initial Value of R15 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x15151515; /* Initial Value of R15 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x14141414; /* Initial Value of R14 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x14141414; /* Initial Value of R14 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x13131313; /* Initial Value of R13 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x13131313; /* Initial Value of R13 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x12121212; /* Initial Value of R12 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x12121212; /* Initial Value of R12 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x11111111; /* Initial Value of R11 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x11111111; /* Initial Value of R11 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x10101010; /* Initial Value of R10 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x10101010; /* Initial Value of R10 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x99999999; /* Initial Value of R09 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x99999999; /* Initial Value of R09 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x88888888; /* Initial Value of R08 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x88888888; /* Initial Value of R08 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x77777777; /* Initial Value of R07 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x77777777; /* Initial Value of R07 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x66666666; /* Initial Value of R06 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x66666666; /* Initial Value of R06 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x55555555; /* Initial Value of R05 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x55555555; /* Initial Value of R05 */
|
||||
pxTopOfStack--;
|
||||
#if __DATA_MODEL__ == 0 || __DATA_MODEL__ == 1
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x44444444; /* Initial Value of R04 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x44444444; /* Initial Value of R04 */
|
||||
pxTopOfStack--;
|
||||
#endif /* configDATA_MODE */
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) 0x22222222; /* Initial Value of R02 */
|
||||
*pxTopOfStack = ( StackType_t ) 0x22222222; /* Initial Value of R02 */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) pvParameters; /* R1 is expected to hold the function parameter*/
|
||||
*pxTopOfStack = ( StackType_t ) pvParameters; /* R1 is expected to hold the function parameter*/
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( portSTACK_TYPE ) portNO_CRITICAL_SECTION_NESTING;
|
||||
*pxTopOfStack = ( StackType_t ) portNO_CRITICAL_SECTION_NESTING;
|
||||
|
||||
/*
|
||||
* Return a pointer to the top of the stack we have generated so this can
|
||||
|
|
@ -170,7 +170,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
portBASE_TYPE xPortStartScheduler( void )
|
||||
BaseType_t xPortStartScheduler( void )
|
||||
{
|
||||
/* Setup the hardware to generate the tick. Interrupts are disabled when
|
||||
this function is called. */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
|
||||
FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
|
||||
All rights reserved
|
||||
|
||||
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
|
||||
|
|
@ -89,15 +89,19 @@ extern "C" {
|
|||
#define portSTACK_TYPE unsigned int
|
||||
#define portBASE_TYPE int
|
||||
|
||||
typedef portSTACK_TYPE StackType_t;
|
||||
typedef long BaseType_t;
|
||||
typedef unsigned long UBaseType_t;
|
||||
|
||||
|
||||
#if (configUSE_16_BIT_TICKS==1)
|
||||
typedef unsigned portSHORT portTickType;
|
||||
#define portMAX_DELAY ( portTickType ) 0xffff
|
||||
typedef uint16_t TickType_t;
|
||||
#define portMAX_DELAY ( TickType_t ) 0xffff
|
||||
#else
|
||||
typedef unsigned portLONG portTickType;
|
||||
#define portMAX_DELAY ( portTickType ) 0xffffffffUL
|
||||
typedef uint32_t TickType_t;
|
||||
#define portMAX_DELAY ( TickType_t ) 0xffffffffUL
|
||||
#endif
|
||||
/*-----------------------------------------------------------*/
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* Interrupt control macros. */
|
||||
#define portDISABLE_INTERRUPTS() __asm ( "DI" )
|
||||
|
|
@ -105,11 +109,11 @@ extern "C" {
|
|||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* Critical section control macros. */
|
||||
#define portNO_CRITICAL_SECTION_NESTING ( ( unsigned portBASE_TYPE ) 0 )
|
||||
#define portNO_CRITICAL_SECTION_NESTING ( ( UBaseType_t ) 0 )
|
||||
|
||||
#define portENTER_CRITICAL() \
|
||||
{ \
|
||||
extern volatile /*unsigned portSHORT*/ portSTACK_TYPE usCriticalNesting; \
|
||||
extern volatile /*uint16_t*/ portSTACK_TYPE usCriticalNesting; \
|
||||
\
|
||||
portDISABLE_INTERRUPTS(); \
|
||||
\
|
||||
|
|
@ -121,7 +125,7 @@ extern volatile /*unsigned portSHORT*/ portSTACK_TYPE usCriticalNesting; \
|
|||
|
||||
#define portEXIT_CRITICAL() \
|
||||
{ \
|
||||
extern volatile /*unsigned portSHORT*/ portSTACK_TYPE usCriticalNesting; \
|
||||
extern volatile /*uint16_t*/ portSTACK_TYPE usCriticalNesting; \
|
||||
\
|
||||
if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING ) \
|
||||
{ \
|
||||
|
|
@ -153,7 +157,7 @@ extern void vTaskSwitchContext( void );
|
|||
/* Hardwware specifics. */
|
||||
#define portBYTE_ALIGNMENT 4
|
||||
#define portSTACK_GROWTH ( -1 )
|
||||
#define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ )
|
||||
#define portTICK_RATE_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* Task function macros as described on the FreeRTOS.org WEB site. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue