Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / portable / IAR / AtmelSAM7S64 / port.c

diff --git a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c
index 334f024720d3e326885e1022cfd407cb422438fa..3109ad90b4677fe94e8b8980597296d2d321570a 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c
+++ b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c
@@ -76,21 +76,21 @@
 #include "task.h"\r
 \r
 /* Constants required to setup the initial stack. */\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 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
 \r
 /* Constants required to setup the PIT. */\r
-#define portPIT_CLOCK_DIVISOR                  ( ( unsigned long ) 16 )\r
+#define portPIT_CLOCK_DIVISOR                  ( ( uint32_t ) 16 )\r
 #define portPIT_COUNTER_VALUE                  ( ( ( configCPU_CLOCK_HZ / portPIT_CLOCK_DIVISOR ) / 1000UL ) * portTICK_RATE_MS )\r
 \r
 /* Constants required to handle critical sections. */\r
-#define portNO_CRITICAL_NESTING                ( ( unsigned long ) 0 )\r
+#define portNO_CRITICAL_NESTING                ( ( uint32_t ) 0 )\r
 \r
 \r
 #define portINT_LEVEL_SENSITIVE  0\r
-#define portPIT_ENABLE         ( ( unsigned short ) 0x1 << 24 )\r
-#define portPIT_INT_ENABLE             ( ( unsigned short ) 0x1 << 25 )\r
+#define portPIT_ENABLE         ( ( uint16_t ) 0x1 << 24 )\r
+#define portPIT_INT_ENABLE             ( ( uint16_t ) 0x1 << 25 )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Setup the PIT to generate the tick interrupts. */\r
@@ -99,7 +99,7 @@ static void prvSetupTimerInterrupt( void );
 /* ulCriticalNesting will get set to zero when the first task starts.  It\r
 cannot be initialised to 0 as this will cause interrupts to be enabled\r
 during the kernel initialisation process. */\r
-unsigned long ulCriticalNesting = ( unsigned long ) 9999;\r
+uint32_t ulCriticalNesting = ( uint32_t ) 9999;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -109,9 +109,9 @@ unsigned long ulCriticalNesting = ( unsigned long ) 9999;
  *\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
@@ -125,47 +125,47 @@ 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 status register is set for system mode, with interrupts enabled. */\r
-       *pxTopOfStack = ( portSTACK_TYPE ) portINITIAL_SPSR;\r
+       *pxTopOfStack = ( StackType_t ) portINITIAL_SPSR;\r
        \r
-       if( ( ( unsigned long ) pxCode & 0x01UL ) != 0x00UL )\r
+       if( ( ( uint32_t ) pxCode & 0x01UL ) != 0x00UL )\r
        {\r
                /* We want the task to start in thumb mode. */\r
                *pxTopOfStack |= portTHUMB_MODE_BIT;\r
@@ -182,7 +182,7 @@ portSTACK_TYPE *pxOriginalTOS;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
 extern void vPortStartFirstTask( void );\r
 \r
@@ -212,7 +212,7 @@ void vPortEndScheduler( void )
        static __arm __irq void vPortNonPreemptiveTick( void );\r
        static __arm __irq void vPortNonPreemptiveTick( void )\r
        {\r
-               unsigned long ulDummy;\r
+               uint32_t ulDummy;\r
                \r
                /* Increment the tick count - which may wake some tasks but as the\r
                preemptive scheduler is not being used any woken task is not given\r