Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / portable / IAR / MSP430X / portmacro.h

diff --git a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
index 68a75eadb0145d50f1fe6308fada1ead0be56ddc..abf5399c081e85bb1f6c650cb8a6030a8b608459 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -85,24 +85,28 @@
 #define portDOUBLE             double\r
 #define portLONG               long\r
 #define portSHORT              int\r
-#define portBASE_TYPE  portSHORT\r
+#define portBASE_TYPE  short\r
 \r
 /* The stack type changes depending on the data model. */\r
 #if( __DATA_MODEL__ == __DATA_MODEL_SMALL__ )\r
-       #define portSTACK_TYPE unsigned short\r
+       #define portSTACK_TYPE uint16_t\r
 #else\r
-       #define portSTACK_TYPE unsigned long\r
+       #define portSTACK_TYPE uint32_t\r
 #endif\r
 \r
+typedef portSTACK_TYPE StackType_t;\r
+typedef short BaseType_t;\r
+typedef unsigned short UBaseType_t;\r
+\r
 #if( configUSE_16_BIT_TICKS == 1 )\r
-       typedef unsigned portSHORT portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffff\r
+       typedef uint16_t TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffff\r
 #else\r
-       typedef unsigned portLONG portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffffffffUL\r
+       typedef uint32_t TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffffffffUL\r
 #endif\r
 \r
-/*-----------------------------------------------------------*/        \r
+/*-----------------------------------------------------------*/\r
 \r
 /* Interrupt control macros. */\r
 #define portDISABLE_INTERRUPTS()       _DINT();_NOP()\r
@@ -110,11 +114,11 @@
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section control macros. */\r
-#define portNO_CRITICAL_SECTION_NESTING                ( ( unsigned portSHORT ) 0 )\r
+#define portNO_CRITICAL_SECTION_NESTING                ( ( uint16_t ) 0 )\r
 \r
 #define portENTER_CRITICAL()                                                                                                   \\r
 {                                                                                                                                                              \\r
-extern volatile unsigned short usCriticalNesting;                                                              \\r
+extern volatile uint16_t usCriticalNesting;                                                            \\r
                                                                                                                                                                \\r
        portDISABLE_INTERRUPTS();                                                                                                       \\r
                                                                                                                                                                \\r
@@ -126,7 +130,7 @@ extern volatile unsigned short usCriticalNesting;                                                           \
 \r
 #define portEXIT_CRITICAL()                                                                                                            \\r
 {                                                                                                                                                              \\r
-extern volatile unsigned short usCriticalNesting;                                                      \\r
+extern volatile uint16_t usCriticalNesting;                                                    \\r
                                                                                                                                                                \\r
        if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING )                                       \\r
        {                                                                                                                                                       \\r
@@ -155,7 +159,7 @@ extern void vPortYield( void );
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( portTickType ) 1000 / configTICK_RATE_HZ )  \r
+#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      __no_operation()\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -165,7 +169,7 @@ extern void vPortYield( void );
 \r
 extern void vTaskSwitchContext( void );\r
 #define portYIELD_FROM_ISR( x ) if( x ) vPortYield()\r
-       \r
+\r
 void vApplicationSetupTimerInterrupt( void );\r
 \r
 /* sizeof( int ) != sizeof( long ) so a full printf() library is required if\r