Change version numbers ready for V8.0.0 release candidate 1 tag.

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

diff --git a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
index 951657948b92a76cad89440a11fd6f7606a351db..b86ea11c18161bb0fd870706dff45181b547bf2d 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 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
@@ -92,22 +93,27 @@ portSTACK_TYPE and portBASE_TYPE. */
 #define portDOUBLE             double\r
 #define portLONG               long\r
 #define portSHORT              short\r
-#define portSTACK_TYPE unsigned 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
+\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
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8       /* Could make four, according to manual. */\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
 #define portYIELD()                                                    \\r
@@ -130,12 +136,12 @@ when an ISR safe FreeRTOS API function was executed.  ISR safe FreeRTOS API
 functions are those that end in FromISR.  FreeRTOS maintains a separate\r
 interrupt API to ensure API function and interrupt entry is as fast and as\r
 simple as possible. */\r
-#define portENABLE_INTERRUPTS()        __set_interrupt_level( ( unsigned char ) 0 )\r
+#define portENABLE_INTERRUPTS()        __set_interrupt_level( ( uint8_t ) 0 )\r
 #ifdef configASSERT\r
        #define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() configASSERT( ( __get_interrupt_level() <= configMAX_SYSCALL_INTERRUPT_PRIORITY ) )\r
-       #define portDISABLE_INTERRUPTS()        if( __get_interrupt_level() < configMAX_SYSCALL_INTERRUPT_PRIORITY ) __set_interrupt_level( ( unsigned char ) configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
+       #define portDISABLE_INTERRUPTS()        if( __get_interrupt_level() < configMAX_SYSCALL_INTERRUPT_PRIORITY ) __set_interrupt_level( ( uint8_t ) configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
 #else\r
-       #define portDISABLE_INTERRUPTS()        __set_interrupt_level( ( unsigned char ) configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
+       #define portDISABLE_INTERRUPTS()        __set_interrupt_level( ( uint8_t ) configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
 #endif\r
 \r
 /* Critical nesting counts are stored in the TCB. */\r
@@ -149,12 +155,12 @@ extern void vTaskExitCritical( void );
 \r
 /* As this port allows interrupt nesting... */\r
 #define portSET_INTERRUPT_MASK_FROM_ISR() __get_interrupt_level(); portDISABLE_INTERRUPTS()\r
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ) __set_interrupt_level( ( unsigned char ) ( uxSavedInterruptStatus ) )\r
+#define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ) __set_interrupt_level( ( uint8_t ) ( uxSavedInterruptStatus ) )\r
 \r
 /* Tickless idle/low power functionality. */\r
 #if configUSE_TICKLESS_IDLE == 1\r
        #ifndef portSUPPRESS_TICKS_AND_SLEEP\r
-               extern void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime );\r
+               extern void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime );\r
                #define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime ) vPortSuppressTicksAndSleep( xExpectedIdleTime )\r
        #endif\r
 #endif\r