Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / portable / GCC / ARM7_AT91FR40008 / port.c

diff --git a/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c b/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c
index 2acaed96a54b7ed99f7c98da8bb0c0d60c86af69..508e66bd24df459e695f75ef5138b1b13acb2045 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c
@@ -87,10 +87,10 @@
 #include "tc.h"\r
 \r
 /* Constants required to setup the task context. */\r
-#define portINITIAL_SPSR                               ( ( portSTACK_TYPE ) 0x1f ) /* System mode, ARM mode, interrupts enabled. */\r
-#define portTHUMB_MODE_BIT                             ( ( portSTACK_TYPE ) 0x20 )\r
-#define portINSTRUCTION_SIZE                   ( ( portSTACK_TYPE ) 4 )\r
-#define portNO_CRITICAL_SECTION_NESTING        ( ( portSTACK_TYPE ) 0 )\r
+#define portINITIAL_SPSR                               ( ( StackType_t ) 0x1f ) /* System mode, ARM mode, interrupts enabled. */\r
+#define portTHUMB_MODE_BIT                             ( ( StackType_t ) 0x20 )\r
+#define portINSTRUCTION_SIZE                   ( ( StackType_t ) 4 )\r
+#define portNO_CRITICAL_SECTION_NESTING        ( ( StackType_t ) 0 )\r
 #define portTICK_PRIORITY_6                            ( 6 )\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -111,9 +111,9 @@ extern void vPortISRStartFirstTask( void );
  *\r
  * See header file for description. \r
  */\r
-portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )\r
+StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )\r
 {\r
-portSTACK_TYPE *pxOriginalTOS;\r
+StackType_t *pxOriginalTOS;\r
 \r
        pxOriginalTOS = pxTopOfStack;\r
        \r
@@ -127,46 +127,46 @@ portSTACK_TYPE *pxOriginalTOS;
        /* First on the stack is the return address - which in this case is the\r
        start of the task.  The offset is added to make the return address appear\r
        as it would within an IRQ ISR. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) pxCode + portINSTRUCTION_SIZE;               \r
+       *pxTopOfStack = ( StackType_t ) pxCode + portINSTRUCTION_SIZE;          \r
        pxTopOfStack--;\r
 \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0xaaaaaaaa;  /* R14 */\r
+       *pxTopOfStack = ( StackType_t ) 0xaaaaaaaa;     /* R14 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) pxOriginalTOS; /* Stack used when task starts goes in R13. */\r
+       *pxTopOfStack = ( StackType_t ) pxOriginalTOS; /* Stack used when task starts goes in R13. */\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x12121212;  /* R12 */\r
+       *pxTopOfStack = ( StackType_t ) 0x12121212;     /* R12 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x11111111;  /* R11 */\r
+       *pxTopOfStack = ( StackType_t ) 0x11111111;     /* R11 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x10101010;  /* R10 */\r
+       *pxTopOfStack = ( StackType_t ) 0x10101010;     /* R10 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x09090909;  /* R9 */\r
+       *pxTopOfStack = ( StackType_t ) 0x09090909;     /* R9 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x08080808;  /* R8 */\r
+       *pxTopOfStack = ( StackType_t ) 0x08080808;     /* R8 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x07070707;  /* R7 */\r
+       *pxTopOfStack = ( StackType_t ) 0x07070707;     /* R7 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x06060606;  /* R6 */\r
+       *pxTopOfStack = ( StackType_t ) 0x06060606;     /* R6 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x05050505;  /* R5 */\r
+       *pxTopOfStack = ( StackType_t ) 0x05050505;     /* R5 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x04040404;  /* R4 */\r
+       *pxTopOfStack = ( StackType_t ) 0x04040404;     /* R4 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x03030303;  /* R3 */\r
+       *pxTopOfStack = ( StackType_t ) 0x03030303;     /* R3 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x02020202;  /* R2 */\r
+       *pxTopOfStack = ( StackType_t ) 0x02020202;     /* R2 */\r
        pxTopOfStack--; \r
-       *pxTopOfStack = ( portSTACK_TYPE ) 0x01010101;  /* R1 */\r
+       *pxTopOfStack = ( StackType_t ) 0x01010101;     /* R1 */\r
        pxTopOfStack--; \r
 \r
        /* When the task starts is will expect to find the function parameter in\r
        R0. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) pvParameters; /* R0 */\r
+       *pxTopOfStack = ( StackType_t ) pvParameters; /* R0 */\r
        pxTopOfStack--;\r
 \r
        /* The last thing onto the stack is the status register, which is set for\r
        system mode, with interrupts enabled. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) portINITIAL_SPSR;\r
+       *pxTopOfStack = ( StackType_t ) portINITIAL_SPSR;\r
 \r
        #ifdef THUMB_INTERWORK\r
        {\r
@@ -187,7 +187,7 @@ portSTACK_TYPE *pxOriginalTOS;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
        /* Start the timer that generates the tick ISR.  Interrupts are disabled\r
        here already. */\r
@@ -213,7 +213,7 @@ void vPortEndScheduler( void )
  */\r
 static void prvSetupTimerInterrupt( void )\r
 {\r
-volatile unsigned long ulDummy;\r
+volatile uint32_t ulDummy;\r
 \r
        /* Enable clock to the tick timer... */\r
        AT91C_BASE_PS->PS_PCER = portTIMER_CLK_ENABLE_BIT;\r
@@ -233,12 +233,12 @@ volatile unsigned long ulDummy;
        #if configUSE_PREEMPTION == 1\r
        {\r
                extern void ( vPreemptiveTick )( void );\r
-               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( unsigned long ) vPreemptiveTick;\r
+               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( uint32_t ) vPreemptiveTick;\r
        }\r
        #else  // else use cooperative scheduler\r
        {\r
                extern void ( vNonPreemptiveTick )( void );\r
-               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( unsigned long ) vNonPreemptiveTick;\r
+               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( uint32_t ) vNonPreemptiveTick;\r
        }\r
        #endif\r
 \r