Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / portable / GCC / STR75x / portmacro.h

diff --git a/FreeRTOS/Source/portable/GCC/STR75x/portmacro.h b/FreeRTOS/Source/portable/GCC/STR75x/portmacro.h
index 8621f7452d804acc090b4910c57cbd96f8c5baf8..bef92cfafec92b351e85f6b4b3e7846f452abcbd 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/STR75x/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/STR75x/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
@@ -87,31 +87,35 @@ extern "C" {
 #define portDOUBLE             double\r
 #define portLONG               long\r
 #define portSHORT              short\r
-#define portSTACK_TYPE unsigned portLONG\r
-#define portBASE_TYPE  portLONG\r
+#define portSTACK_TYPE uint32_t\r
+#define portBASE_TYPE  long\r
+\r
+typedef portSTACK_TYPE StackType_t;\r
+typedef long BaseType_t;\r
+typedef unsigned long 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
 /* Hardware specifics. */\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 portBYTE_ALIGNMENT                     8\r
 #define portYIELD()                                    asm volatile ( "SWI 0" )\r
 #define portNOP()                                      asm volatile ( "NOP" )\r
-/*-----------------------------------------------------------*/        \r
+/*-----------------------------------------------------------*/\r
 \r
 /* Critical section handling. */\r
 /*\r
  * The interrupt management utilities can only be called from ARM mode.  When\r
- * THUMB_INTERWORK is defined the utilities are defined as functions in \r
- * portISR.c to ensure a switch to ARM mode.  When THUMB_INTERWORK is not \r
+ * THUMB_INTERWORK is defined the utilities are defined as functions in\r
+ * portISR.c to ensure a switch to ARM mode.  When THUMB_INTERWORK is not\r
  * defined then the utilities are defined as macros here - as per other ports.\r
  */\r
 \r
@@ -122,7 +126,7 @@ extern "C" {
 \r
        #define portDISABLE_INTERRUPTS()        vPortDisableInterruptsFromThumb()\r
        #define portENABLE_INTERRUPTS()         vPortEnableInterruptsFromThumb()\r
-       \r
+\r
 #else\r
 \r
        #define portDISABLE_INTERRUPTS()                                                                                        \\r
@@ -132,7 +136,7 @@ extern "C" {
                        "ORR    R0, R0, #0xC0   \n\t"   /* Disable IRQ, FIQ.                    */      \\r
                        "MSR    CPSR, R0                \n\t"   /* Write back modified value.   */      \\r
                        "LDMIA  SP!, {R0}                       " )     /* Pop R0.                                              */\r
-                       \r
+\r
        #define portENABLE_INTERRUPTS()                                                                                         \\r
                asm volatile (                                                                                                                  \\r
                        "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                             */      \\r
@@ -148,7 +152,7 @@ extern void vPortExitCritical( void );
 \r
 #define portENTER_CRITICAL()           vPortEnterCritical();\r
 #define portEXIT_CRITICAL()                    vPortExitCritical();\r
-/*-----------------------------------------------------------*/        \r
+/*-----------------------------------------------------------*/\r
 \r
 /* Task utilities. */\r
 #define portEND_SWITCHING_ISR( xSwitchRequired )       \\r
@@ -160,7 +164,7 @@ extern void vTaskSwitchContext( void );                             \
                vTaskSwitchContext();                                           \\r
        }                                                                                               \\r
 }\r
-/*-----------------------------------------------------------*/        \r
+/*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters )\r