]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/IAR/78K0R/portmacro.h
Replace standard types with stdint.h types.
[freertos] / FreeRTOS / Source / portable / IAR / 78K0R / portmacro.h
index e1842a8012513ed1033ccf1fb47fc1a240015c58..9d1c42633d7e2879bd804c1b18944d2ca1c6c639 100644 (file)
@@ -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
@@ -87,17 +87,21 @@ extern "C" {
 #define portDOUBLE      double\r
 #define portLONG        long\r
 #define portSHORT       short\r
-#define portSTACK_TYPE  unsigned short\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
 #if (configUSE_16_BIT_TICKS==1)\r
-       typedef unsigned int portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffff\r
+       typedef unsigned int TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffff\r
 #else\r
-       typedef unsigned long 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
 /* Interrupt control macros. */\r
 #define portDISABLE_INTERRUPTS() __asm ( "DI" )\r
@@ -105,11 +109,11 @@ extern "C" {
 /*-----------------------------------------------------------*/\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
@@ -121,7 +125,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
@@ -148,7 +152,7 @@ extern void vPortStart( void );
 /* Hardwware 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
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r