Map portTICK_RATE_MS to portTICK_PERIOD_MS.

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

diff --git a/FreeRTOS/Source/portable/GCC/RX600/portmacro.h b/FreeRTOS/Source/portable/GCC/RX600/portmacro.h
index 5338c22fb7b226c2e99aa3f066bece0bc5f5c6ee..cf73bb279ab37431524c835af80a3f9b320fd99a 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX600/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/RX600/portmacro.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.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
@@ -72,7 +72,7 @@ extern "C" {
 #endif\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
@@ -88,27 +88,31 @@ 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
 #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_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      __asm volatile( "NOP" )\r
 \r
 /* Yield equivalent to "*portITU_SWINTR = 0x01; ( void ) *portITU_SWINTR;"\r
 where portITU_SWINTR is the location of the software interrupt register\r
-(0x000872E0).  Don't rely on the assembler to select a register, so instead \r
+(0x000872E0).  Don't rely on the assembler to select a register, so instead\r
 save and restore clobbered registers manually. */\r
 #define portYIELD()                                                    \\r
        __asm volatile                                                  \\r
@@ -122,14 +126,14 @@ save and restore clobbered registers manually. */
 \r
 #define portYIELD_FROM_ISR( x )        if( x != pdFALSE ) portYIELD()\r
 \r
-/* These macros should not be called directly, but through the \r
-taskENTER_CRITICAL() and taskEXIT_CRITICAL() macros.  An extra check is \r
-performed if configASSERT() is defined to ensure an assertion handler does not \r
-inadvertently attempt to lower the IPL when the call to assert was triggered \r
-because the IPL value was found to be above    configMAX_SYSCALL_INTERRUPT_PRIORITY \r
-when an ISR safe FreeRTOS API function was executed.  ISR safe FreeRTOS API \r
-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
+/* These macros should not be called directly, but through the\r
+taskENTER_CRITICAL() and taskEXIT_CRITICAL() macros.  An extra check is\r
+performed if configASSERT() is defined to ensure an assertion handler does not\r
+inadvertently attempt to lower the IPL when the call to assert was triggered\r
+because the IPL value was found to be above    configMAX_SYSCALL_INTERRUPT_PRIORITY\r
+when an ISR safe FreeRTOS API function was executed.  ISR safe FreeRTOS API\r
+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()        __asm volatile ( "MVTIPL        #0" )\r
 #ifdef configASSERT\r
@@ -149,8 +153,8 @@ extern void vTaskExitCritical( void );
 #define portEXIT_CRITICAL()            vTaskExitCritical()\r
 \r
 /* As this port allows interrupt nesting... */\r
-unsigned long ulPortGetIPL( void ) __attribute__((naked));\r
-void vPortSetIPL( unsigned long ulNewIPL ) __attribute__((naked));\r
+uint32_t ulPortGetIPL( void ) __attribute__((naked));\r
+void vPortSetIPL( uint32_t ulNewIPL ) __attribute__((naked));\r
 #define portSET_INTERRUPT_MASK_FROM_ISR() ulPortGetIPL(); portDISABLE_INTERRUPTS()\r
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus ) vPortSetIPL( uxSavedInterruptStatus )\r
 \r