Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / portable / Rowley / MSP430F449 / portmacro.h

diff --git a/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h b/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h
index 226c4de8888e8198034aa2563ebefbd284937152..f50a882558368aa5acc467b16355eac5b17eb780 100644 (file)
--- a/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h
+++ b/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.2 - 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
 \r
@@ -66,7 +67,7 @@
 #define PORTMACRO_H\r
 \r
 /*-----------------------------------------------------------\r
- * Port specific definitions.  \r
+ * Port specific definitions.\r
  *\r
  * The settings in this file configure FreeRTOS correctly for the\r
  * given hardware and compiler.\r
@@ -81,18 +82,23 @@
 #define portDOUBLE             double\r
 #define portLONG               long\r
 #define portSHORT              int\r
-#define portSTACK_TYPE unsigned portSHORT\r
-#define portBASE_TYPE  portSHORT\r
+#define portSTACK_TYPE uint16_t\r
+#define portBASE_TYPE  short\r
+\r
+typedef portSTACK_TYPE StackType_t;\r
+typedef short BaseType_t;\r
+typedef unsigned short UBaseType_t;\r
+\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 ) 0xffffffff\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
@@ -100,11 +106,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 portSHORT usCriticalNesting;                                                  \\r
+extern volatile uint16_t usCriticalNesting;                                                    \\r
                                                                                                                                                                \\r
        portDISABLE_INTERRUPTS();                                                                                                       \\r
                                                                                                                                                                \\r
@@ -116,7 +122,7 @@ extern volatile unsigned portSHORT usCriticalNesting;                                                       \
 \r
 #define portEXIT_CRITICAL()                                                                                                            \\r
 {                                                                                                                                                              \\r
-extern volatile unsigned portSHORT usCriticalNesting;                                                  \\r
+extern volatile uint16_t usCriticalNesting;                                                    \\r
                                                                                                                                                                \\r
        if( usCriticalNesting > portNO_CRITICAL_SECTION_NESTING )                                       \\r
        {                                                                                                                                                       \\r
@@ -136,17 +142,17 @@ extern volatile unsigned portSHORT usCriticalNesting;                                                     \
 /* Task utilities. */\r
 \r
 /*\r
- * Manual context switch called by portYIELD or taskYIELD.  \r
+ * Manual context switch called by portYIELD or taskYIELD.\r
  */\r
-extern void vPortYield( void ); \r
+extern void vPortYield( void );\r
 #define portYIELD() vPortYield()\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( portTickType ) 1000 / configTICK_RATE_HZ )  \r
-#define portNOP()      \r
+#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portNOP()\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r