Map portTICK_RATE_MS to portTICK_PERIOD_MS.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2164 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h
index bfe731eee3be917fa68b48211827bc7bb6bb31cd..39d6d229d786e8680a136d4f6b0492dc3bf9397e 100644 (file)
--- a/FreeRTOS/Source/include/FreeRTOS.h
+++ b/FreeRTOS/Source/include/FreeRTOS.h
@@ -699,6 +699,7 @@ is included as it is used by the port layer. */
 #define xTimerHandle TimerHandle_t\r
 #define xCoRoutineHandle CoRoutineHandle_t\r
 #define pdTASK_HOOK_CODE TaskHookFunction_t\r
+#define portTICK_RATE_MS portTICK_PERIOD_MS\r
 \r
 /* Backward compatibility within the scheduler code only - these definitions\r
 are not really required but are included for completeness. */\r

diff --git a/FreeRTOS/Source/include/croutine.h b/FreeRTOS/Source/include/croutine.h
index afe1ab79aad64bfc469ba6f0ef6e11642d91c418..92b757359a5bcd9d2ec1bb6659dcc2da96127896 100644 (file)
--- a/FreeRTOS/Source/include/croutine.h
+++ b/FreeRTOS/Source/include/croutine.h
@@ -295,7 +295,7 @@ void vCoRoutineSchedule( void );
  *\r
  * @param xTickToDelay The number of ticks that the co-routine should delay\r
  * for.  The actual amount of time this equates to is defined by\r
- * configTICK_RATE_HZ (set in FreeRTOSConfig.h).  The constant portTICK_RATE_MS\r
+ * configTICK_RATE_HZ (set in FreeRTOSConfig.h).  The constant portTICK_PERIOD_MS\r
  * can be used to convert ticks to milliseconds.\r
  *\r
  * Example usage:\r
@@ -306,7 +306,7 @@ void vCoRoutineSchedule( void );
  // Variables in co-routines must be declared static if they must maintain value across a blocking call.\r
  // This may not be necessary for const variables.\r
  // We are to delay for 200ms.\r
- static const xTickType xDelayTime = 200 / portTICK_RATE_MS;\r
+ static const xTickType xDelayTime = 200 / portTICK_PERIOD_MS;\r
 \r
      // Must start every co-routine with a call to crSTART();\r
      crSTART( xHandle );\r
@@ -372,7 +372,7 @@ void vCoRoutineSchedule( void );
  * to wait for space to become available on the queue, should space not be\r
  * available immediately. The actual amount of time this equates to is defined\r
  * by configTICK_RATE_HZ (set in FreeRTOSConfig.h).  The constant\r
- * portTICK_RATE_MS can be used to convert ticks to milliseconds (see example\r
+ * portTICK_PERIOD_MS can be used to convert ticks to milliseconds (see example\r
  * below).\r
  *\r
  * @param pxResult The variable pointed to by pxResult will be set to pdPASS if\r
@@ -470,7 +470,7 @@ void vCoRoutineSchedule( void );
  * to wait for data to become available from the queue, should data not be\r
  * available immediately. The actual amount of time this equates to is defined\r
  * by configTICK_RATE_HZ (set in FreeRTOSConfig.h).  The constant\r
- * portTICK_RATE_MS can be used to convert ticks to milliseconds (see the\r
+ * portTICK_PERIOD_MS can be used to convert ticks to milliseconds (see the\r
  * crQUEUE_SEND example).\r
  *\r
  * @param pxResult The variable pointed to by pxResult will be set to pdPASS if\r

diff --git a/FreeRTOS/Source/include/event_groups.h b/FreeRTOS/Source/include/event_groups.h
index 94e4b68cfea12efece3e5dadb3173c0ba8fd03c5..4407fff6530f925e6d5bf6a9657852e1195397dc 100644 (file)
--- a/FreeRTOS/Source/include/event_groups.h
+++ b/FreeRTOS/Source/include/event_groups.h
@@ -230,7 +230,7 @@ EventGroupHandle_t xEventGroupCreate( void ) PRIVILEGED_FUNCTION;
    void aFunction( EventGroupHandle_t xEventGroup )\r
    {\r
    EventBits_t uxBits;\r
-   const TickType_t xTicksToWait = 100 / portTICK_RATE_MS;\r
+   const TickType_t xTicksToWait = 100 / portTICK_PERIOD_MS;\r
 \r
                // Wait a maximum of 100ms for either bit 0 or bit 4 to be set within\r
                // the event group.  Clear the bits before exiting.\r
@@ -545,7 +545,7 @@ EventBits_t xEventGroupSetBits( EventGroupHandle_t xEventGroup, const EventBits_
  void vTask0( void *pvParameters )\r
  {\r
  EventBits_t uxReturn;\r
- TickType_t xTicksToWait = 100 / portTICK_RATE_MS;\r
+ TickType_t xTicksToWait = 100 / portTICK_PERIOD_MS;\r
 \r
         for( ;; )\r
         {\r

diff --git a/FreeRTOS/Source/include/queue.h b/FreeRTOS/Source/include/queue.h
index e8438aa0cd2b529318a6d632c586ed1d0eac43d2..d160a0fcded02fbb9dcf6af31afdc17938e4ab02 100644 (file)
--- a/FreeRTOS/Source/include/queue.h
+++ b/FreeRTOS/Source/include/queue.h
@@ -196,7 +196,7 @@ typedef void * QueueSetMemberHandle_t;
  * waiting for space to become available on the queue, should it already\r
  * be full.  The call will return immediately if this is set to 0 and the\r
  * queue is full.  The time is defined in tick periods so the constant\r
- * portTICK_RATE_MS should be used to convert to real time if this is required.\r
+ * portTICK_PERIOD_MS should be used to convert to real time if this is required.\r
  *\r
  * @return pdTRUE if the item was successfully posted, otherwise errQUEUE_FULL.\r
  *\r
@@ -278,7 +278,7 @@ typedef void * QueueSetMemberHandle_t;
  * waiting for space to become available on the queue, should it already\r
  * be full.  The call will return immediately if this is set to 0 and the queue\r
  * is full.  The  time is defined in tick periods so the constant\r
- * portTICK_RATE_MS should be used to convert to real time if this is required.\r
+ * portTICK_PERIOD_MS should be used to convert to real time if this is required.\r
  *\r
  * @return pdTRUE if the item was successfully posted, otherwise errQUEUE_FULL.\r
  *\r
@@ -362,7 +362,7 @@ typedef void * QueueSetMemberHandle_t;
  * waiting for space to become available on the queue, should it already\r
  * be full.  The call will return immediately if this is set to 0 and the\r
  * queue is full.  The time is defined in tick periods so the constant\r
- * portTICK_RATE_MS should be used to convert to real time if this is required.\r
+ * portTICK_PERIOD_MS should be used to convert to real time if this is required.\r
  *\r
  * @return pdTRUE if the item was successfully posted, otherwise errQUEUE_FULL.\r
  *\r
@@ -529,7 +529,7 @@ typedef void * QueueSetMemberHandle_t;
  * waiting for space to become available on the queue, should it already\r
  * be full.  The call will return immediately if this is set to 0 and the\r
  * queue is full.  The time is defined in tick periods so the constant\r
- * portTICK_RATE_MS should be used to convert to real time if this is required.\r
+ * portTICK_PERIOD_MS should be used to convert to real time if this is required.\r
  *\r
  * @param xCopyPosition Can take the value queueSEND_TO_BACK to place the\r
  * item at the back of the queue, or queueSEND_TO_FRONT to place the item\r
@@ -619,7 +619,7 @@ BaseType_t xQueueGenericSend( QueueHandle_t xQueue, const void * const pvItemToQ
  * @param xTicksToWait The maximum amount of time the task should block\r
  * waiting for an item to receive should the queue be empty at the time\r
  * of the call.         The time is defined in tick periods so the constant\r
- * portTICK_RATE_MS should be used to convert to real time if this is required.\r
+ * portTICK_PERIOD_MS should be used to convert to real time if this is required.\r
  * xQueuePeek() will return immediately if xTicksToWait is 0 and the queue\r
  * is empty.\r
  *\r
@@ -746,7 +746,7 @@ BaseType_t xQueuePeekFromISR( QueueHandle_t xQueue, void * const pvBuffer ) PRIV
  * waiting for an item to receive should the queue be empty at the time\r
  * of the call.         xQueueReceive() will return immediately if xTicksToWait\r
  * is zero and the queue is empty.  The time is defined in tick periods so the\r
- * constant portTICK_RATE_MS should be used to convert to real time if this is\r
+ * constant portTICK_PERIOD_MS should be used to convert to real time if this is\r
  * required.\r
  *\r
  * @return pdTRUE if an item was successfully received from the queue,\r
@@ -839,7 +839,7 @@ BaseType_t xQueuePeekFromISR( QueueHandle_t xQueue, void * const pvBuffer ) PRIV
  * @param xTicksToWait The maximum amount of time the task should block\r
  * waiting for an item to receive should the queue be empty at the time\r
  * of the call.         The time is defined in tick periods so the constant\r
- * portTICK_RATE_MS should be used to convert to real time if this is required.\r
+ * portTICK_PERIOD_MS should be used to convert to real time if this is required.\r
  * xQueueGenericReceive() will return immediately if the queue is empty and\r
  * xTicksToWait is 0.\r
  *\r

diff --git a/FreeRTOS/Source/include/semphr.h b/FreeRTOS/Source/include/semphr.h
index 638a6d25c98435a0e58fde5b29ac44725f3d1047..8a21e9655c48ebc14e5102a187a0dd0565410055 100644 (file)
--- a/FreeRTOS/Source/include/semphr.h
+++ b/FreeRTOS/Source/include/semphr.h
@@ -195,7 +195,7 @@ typedef QueueHandle_t SemaphoreHandle_t;
  * the semaphore was created.\r
  *\r
  * @param xBlockTime The time in ticks to wait for the semaphore to become\r
- * available.  The macro portTICK_RATE_MS can be used to convert this to a\r
+ * available.  The macro portTICK_PERIOD_MS can be used to convert this to a\r
  * real time.  A block time of zero can be used to poll the semaphore.  A block\r
  * time of portMAX_DELAY can be used to block indefinitely (provided\r
  * INCLUDE_vTaskSuspend is set to 1 in FreeRTOSConfig.h).\r
@@ -274,7 +274,7 @@ typedef QueueHandle_t SemaphoreHandle_t;
  * handle returned by xSemaphoreCreateRecursiveMutex();\r
  *\r
  * @param xBlockTime The time in ticks to wait for the semaphore to become\r
- * available.  The macro portTICK_RATE_MS can be used to convert this to a\r
+ * available.  The macro portTICK_PERIOD_MS can be used to convert this to a\r
  * real time.  A block time of zero can be used to poll the semaphore.  If\r
  * the task already owns the semaphore then xSemaphoreTakeRecursive() will\r
  * return immediately no matter what the value of xBlockTime.\r

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index b09c64a3592c5990d46f57342efe420a97d5a35a..39de192f510cead4d71f2a00ab9985a55f0a1d04 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -494,7 +494,7 @@ void vTaskDelete( TaskHandle_t xTaskToDelete ) PRIVILEGED_FUNCTION;
  *\r
  * Delay a task for a given number of ticks.  The actual time that the\r
  * task remains blocked depends on the tick rate.  The constant\r
- * portTICK_RATE_MS can be used to calculate real time from the tick\r
+ * portTICK_PERIOD_MS can be used to calculate real time from the tick\r
  * rate - with the resolution of one tick period.\r
  *\r
  * INCLUDE_vTaskDelay must be defined as 1 for this function to be available.\r
@@ -521,7 +521,7 @@ void vTaskDelete( TaskHandle_t xTaskToDelete ) PRIVILEGED_FUNCTION;
  void vTaskFunction( void * pvParameters )\r
  {\r
  // Block for 500ms.\r
- const TickType_t xDelay = 500 / portTICK_RATE_MS;\r
+ const TickType_t xDelay = 500 / portTICK_PERIOD_MS;\r
 \r
         for( ;; )\r
         {\r
@@ -558,7 +558,7 @@ void vTaskDelay( const TickType_t xTicksToDelay ) PRIVILEGED_FUNCTION;
  * is called, vTaskDelayUntil () specifies the absolute (exact) time at which it wishes to\r
  * unblock.\r
  *\r
- * The constant portTICK_RATE_MS can be used to calculate real time from the tick\r
+ * The constant portTICK_PERIOD_MS can be used to calculate real time from the tick\r
  * rate - with the resolution of one tick period.\r
  *\r
  * @param pxPreviousWakeTime Pointer to a variable that holds the time at which the\r
@@ -1415,7 +1415,7 @@ BaseType_t xTaskIncrementTick( void ) PRIVILEGED_FUNCTION;
  *\r
  * @param xTicksToWait The maximum amount of time that the task should wait\r
  * for the event to occur.  This is specified in kernel ticks,the constant\r
- * portTICK_RATE_MS can be used to convert kernel ticks into a real time\r
+ * portTICK_PERIOD_MS can be used to convert kernel ticks into a real time\r
  * period.\r
  */\r
 void vTaskPlaceOnEventList( List_t * const pxEventList, const TickType_t xTicksToWait ) PRIVILEGED_FUNCTION;\r

diff --git a/FreeRTOS/Source/include/timers.h b/FreeRTOS/Source/include/timers.h
index 6ef9d91bbb0eac6924abaa36de5a736623dfd5e9..7c8a9cd7bc744c12be788ea6414bb826024af819 100644 (file)
--- a/FreeRTOS/Source/include/timers.h
+++ b/FreeRTOS/Source/include/timers.h
@@ -133,11 +133,11 @@ typedef void (*PendedFunction_t)( void *, uint32_t );
  * by its handle, and never by its name.\r
  *\r
  * @param xTimerPeriodInTicks The timer period.  The time is defined in tick\r
- * periods so the constant portTICK_RATE_MS can be used to convert a time that\r
+ * periods so the constant portTICK_PERIOD_MS can be used to convert a time that\r
  * has been specified in milliseconds.  For example, if the timer must expire\r
  * after 100 ticks, then xTimerPeriodInTicks should be set to 100.\r
  * Alternatively, if the timer must expire after 500ms, then xPeriod can be set\r
- * to ( 500 / portTICK_RATE_MS ) provided configTICK_RATE_HZ is less than or\r
+ * to ( 500 / portTICK_PERIOD_MS ) provided configTICK_RATE_HZ is less than or\r
  * equal to 1000.\r
  *\r
  * @param uxAutoReload If uxAutoReload is set to pdTRUE then the timer will\r
@@ -431,11 +431,11 @@ TaskHandle_t xTimerGetTimerDaemonTaskHandle( void );
  * @param xTimer The handle of the timer that is having its period changed.\r
  *\r
  * @param xNewPeriod The new period for xTimer. Timer periods are specified in\r
- * tick periods, so the constant portTICK_RATE_MS can be used to convert a time\r
+ * tick periods, so the constant portTICK_PERIOD_MS can be used to convert a time\r
  * that has been specified in milliseconds.  For example, if the timer must\r
  * expire after 100 ticks, then xNewPeriod should be set to 100.  Alternatively,\r
  * if the timer must expire after 500ms, then xNewPeriod can be set to\r
- * ( 500 / portTICK_RATE_MS ) provided configTICK_RATE_HZ is less than\r
+ * ( 500 / portTICK_PERIOD_MS ) provided configTICK_RATE_HZ is less than\r
  * or equal to 1000.\r
  *\r
  * @param xBlockTime Specifies the time, in ticks, that the calling task should\r
@@ -472,7 +472,7 @@ TaskHandle_t xTimerGetTimerDaemonTaskHandle( void );
  *         // cause the timer to start.  Block for a maximum of 100 ticks if the\r
  *         // change period command cannot immediately be sent to the timer\r
  *         // command queue.\r
- *         if( xTimerChangePeriod( xTimer, 500 / portTICK_RATE_MS, 100 ) == pdPASS )\r
+ *         if( xTimerChangePeriod( xTimer, 500 / portTICK_PERIOD_MS, 100 ) == pdPASS )\r
  *         {\r
  *             // The command was successfully sent.\r
  *         }\r
@@ -613,7 +613,7 @@ TaskHandle_t xTimerGetTimerDaemonTaskHandle( void );
  *     // Create then start the one-shot timer that is responsible for turning\r
  *     // the back-light off if no keys are pressed within a 5 second period.\r
  *     xBacklightTimer = xTimerCreate( "BacklightTimer",           // Just a text name, not used by the kernel.\r
- *                                     ( 5000 / portTICK_RATE_MS), // The timer period in ticks.\r
+ *                                     ( 5000 / portTICK_PERIOD_MS), // The timer period in ticks.\r
  *                                     pdFALSE,                    // The timer is a one-shot timer.\r
  *                                     0,                          // The id is not used by the callback so can take any value.\r
  *                                     vBacklightTimerCallback     // The callback function that switches the LCD back-light off.\r
@@ -809,11 +809,11 @@ TaskHandle_t xTimerGetTimerDaemonTaskHandle( void );
  * @param xTimer The handle of the timer that is having its period changed.\r
  *\r
  * @param xNewPeriod The new period for xTimer. Timer periods are specified in\r
- * tick periods, so the constant portTICK_RATE_MS can be used to convert a time\r
+ * tick periods, so the constant portTICK_PERIOD_MS can be used to convert a time\r
  * that has been specified in milliseconds.  For example, if the timer must\r
  * expire after 100 ticks, then xNewPeriod should be set to 100.  Alternatively,\r
  * if the timer must expire after 500ms, then xNewPeriod can be set to\r
- * ( 500 / portTICK_RATE_MS ) provided configTICK_RATE_HZ is less than\r
+ * ( 500 / portTICK_PERIOD_MS ) provided configTICK_RATE_HZ is less than\r
  * or equal to 1000.\r
  *\r
  * @param pxHigherPriorityTaskWoken The timer service/daemon task spends most\r

diff --git a/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h b/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h
index 97ded50f20ddbfb5e6a119170e8d800f295a8536..eb4284449e4121c6c9d569776e6ee4cbe810c145 100644 (file)
--- a/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h
+++ b/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h
@@ -114,7 +114,7 @@ typedef unsigned short UBaseType_t;
 #define portSTACK_GROWTH                               ( -1 )\r
 #define portSWITCH_INT_NUMBER                  0x80\r
 #define portYIELD()                                            __asm{ int portSWITCH_INT_NUMBER }\r
-#define portTICK_RATE_MS               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT      2\r
 #define portINITIAL_SW         ( ( portSTACK_TYPE ) 0x0202 )   /* Start the tasks with interrupts enabled. */\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h b/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h
index b7705038070de9afa47c7ba2cf3375038dda6d35..3a066214be7e36ab6bd00999a2bc42401f712d11 100644 (file)
--- a/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h
+++ b/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h
@@ -115,7 +115,7 @@ typedef unsigned short UBaseType_t;
 #define portSWITCH_INT_NUMBER  0x80\r
 #define portYIELD()                            __asm{ int portSWITCH_INT_NUMBER }\r
 #define portDOS_TICK_RATE              ( 18.20648 )\r
-#define portTICK_RATE_MS               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portTICKS_PER_DOS_TICK ( ( uint16_t ) ( ( ( portDOUBLE ) configTICK_RATE_HZ / portDOS_TICK_RATE ) + 0.5 ) )\r
 #define portINITIAL_SW                 ( ( portSTACK_TYPE ) 0x0202 )   /* Start the tasks with interrupts enabled. */\r
 #define portBYTE_ALIGNMENT             ( 2 )\r

diff --git a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portmacro.h b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portmacro.h
index dcaa92209da3a4fe8db6e256d84bad1ee45644b5..03042c7285150596cd2fe69c8f51a7f33c9f0cf8 100644 (file)
--- a/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portmacro.h
+++ b/FreeRTOS/Source/portable/CCS/ARM_Cortex-R4/portmacro.h
@@ -100,7 +100,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH    (-1)\r
-#define portTICK_RATE_MS    ((TickType_t) 1000 / configTICK_RATE_HZ)\r
+#define portTICK_PERIOD_MS    ((TickType_t) 1000 / configTICK_RATE_HZ)\r
 #define portBYTE_ALIGNMENT  8\r
 \r
 /* Critical section handling. */\r

diff --git a/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h b/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h
index 00299b8094602d71c68eaa4470e09252573d7009..a80412bf22d1a6ce65b0f6c321f6a231970ac8ef 100644 (file)
--- a/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h
+++ b/FreeRTOS/Source/portable/CCS/MSP430X/portmacro.h
@@ -159,7 +159,7 @@ extern void vPortYield( void );
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      __no_operation()\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h b/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h
index 680284a018a825ac64ecce4bea6aa87ab159c031..188ab87364123af12a508d7a948af036c095c3fb 100644 (file)
--- a/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h
+++ b/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h
@@ -106,7 +106,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     4\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 uint32_t ulPortSetIPL( uint32_t );\r

diff --git a/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h b/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h
index 9bf34da63ebe2e272bbb5bb8901965dff1cd37d4..c8b2d45876508c04a941979cf2b10368d8158764 100644 (file)
--- a/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h
+++ b/FreeRTOS/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     4\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 uint32_t ulPortSetIPL( uint32_t );\r
 #define portDISABLE_INTERRUPTS()       ulPortSetIPL( configMAX_SYSCALL_INTERRUPT_PRIORITY )\r

diff --git a/FreeRTOS/Source/portable/CodeWarrior/HCS12/portmacro.h b/FreeRTOS/Source/portable/CodeWarrior/HCS12/portmacro.h
index 5c4775030536331c3279d49f3d2da6cbe6606ce6..64c2f4d3a830a719f940b376b040f242486fb926 100644 (file)
--- a/FreeRTOS/Source/portable/CodeWarrior/HCS12/portmacro.h
+++ b/FreeRTOS/Source/portable/CodeWarrior/HCS12/portmacro.h
@@ -102,7 +102,7 @@ typedef unsigned char UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     1\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portYIELD()                                    __asm( "swi" );\r
 #define portNOP()                                      __asm( "nop" );\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h
index c8990503cabe2aa596c7cddc7e65fdf525422f35..719738024e58640169a4737a97362f99dbe0c0f5 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h
@@ -127,7 +127,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_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

diff --git a/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/port.c b/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/port.c
index 4bbf5653191436691478a28aed66a0e87b3c06bd..6883023f69442588b636f6421f7d5d36595edfc1 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/port.c
@@ -96,7 +96,7 @@
 \r
 /* Constants required to setup the PIT. */\r
 #define portPIT_CLOCK_DIVISOR                  ( ( uint32_t ) 16 )\r
-#define portPIT_COUNTER_VALUE                  ( ( ( configCPU_CLOCK_HZ / portPIT_CLOCK_DIVISOR ) / 1000UL ) * portTICK_RATE_MS )\r
+#define portPIT_COUNTER_VALUE                  ( ( ( configCPU_CLOCK_HZ / portPIT_CLOCK_DIVISOR ) / 1000UL ) * portTICK_PERIOD_MS )\r
 \r
 #define portINT_LEVEL_SENSITIVE  0\r
 #define portPIT_ENABLE         ( ( uint16_t ) 0x1 << 24 )\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
index e6f438168479e24af7092cb6352c5e21b817ad0f..67441dae47c113273fc9aeec292c75500a7f68aa 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
@@ -127,7 +127,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portNOP()                                      __asm volatile ( "NOP" );\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM7_LPC2000/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM7_LPC2000/portmacro.h
index 454bcb46061db3cde73b9fe51d17df13b5eed7ba..56159e9c10e9afd25c5561254c086ae248db5026 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM7_LPC2000/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM7_LPC2000/portmacro.h
@@ -104,7 +104,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portNOP()                                      __asm volatile ( "NOP" );\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM7_LPC23xx/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM7_LPC23xx/portmacro.h
index d1d19b71cebc395badafa68bfdb8043f5d9ab13f..22f82a9368188e0981f6857603082a5c9b40d863 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM7_LPC23xx/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM7_LPC23xx/portmacro.h
@@ -127,7 +127,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portNOP()                                      __asm volatile ( "NOP" );\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
index 9b4cd8ee8d51b1475482cc605a78d072105c624b..1bbdf5b4c22c917bf3fc054051678ea4c58368a8 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
index a8f7030c055f0a7d87d7b1e696ba46e571677dae..1cf55fbf00c97c3ba71f4d676001bf4ea9331539 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
index 19a073f9e460ea5975a0ddaea40cba2c2a323e39..5a12a6195c012d5eb27bff3167a669e1a4304f1a 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
@@ -140,7 +140,7 @@ typedef struct MPU_SETTINGS
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
index 43b8a0ac15bd9f260f71603c3a07170e786ec3e6..a7f2aa00b28ac58e88a2556259641b4104a8617e 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ATMega323/portmacro.h b/FreeRTOS/Source/portable/GCC/ATMega323/portmacro.h
index b2757686b2571d44c1d8ce1ba8366fe4b0b541f4..1a4ac5190ef2721d6a838bf7eccf4997b17aadd3 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ATMega323/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ATMega323/portmacro.h
@@ -123,7 +123,7 @@ typedef unsigned char UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     1\r
 #define portNOP()                                      asm volatile ( "nop" );\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/GCC/AVR32_UC3/portmacro.h b/FreeRTOS/Source/portable/GCC/AVR32_UC3/portmacro.h
index 6f126e78205915e5d0df60967374ce772a54599c..1b6ebde127ee58ac722d97734c1ac9fcd1b362ff 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/AVR32_UC3/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/AVR32_UC3/portmacro.h
@@ -112,9 +112,9 @@ typedef portSTACK_TYPE StackType_t;
 typedef long BaseType_t;\r
 typedef unsigned long UBaseType_t;\r
 \r
-#define TASK_DELAY_MS(x)   ( (x)        /portTICK_RATE_MS )\r
-#define TASK_DELAY_S(x)    ( (x)*1000   /portTICK_RATE_MS )\r
-#define TASK_DELAY_MIN(x)  ( (x)*60*1000/portTICK_RATE_MS )\r
+#define TASK_DELAY_MS(x)   ( (x)        /portTICK_PERIOD_MS )\r
+#define TASK_DELAY_S(x)    ( (x)*1000   /portTICK_PERIOD_MS )\r
+#define TASK_DELAY_MIN(x)  ( (x)*60*1000/portTICK_PERIOD_MS )\r
 \r
 #define configTICK_TC_IRQ             ATPASTE2(AVR32_TC_IRQ, configTICK_TC_CHANNEL)\r
 \r
@@ -129,7 +129,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH      ( -1 )\r
-#define portTICK_RATE_MS      ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS      ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT    4\r
 #define portNOP()             {__asm__ __volatile__ ("nop");}\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/GCC/CORTUS_APS3/portmacro.h b/FreeRTOS/Source/portable/GCC/CORTUS_APS3/portmacro.h
index 8f6fbff3654bb3197c6a72344b2f3980590e0f6e..b4ce2e36686b5ce776eeeffab2732ae22f7c3fa6 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/CORTUS_APS3/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/CORTUS_APS3/portmacro.h
@@ -106,7 +106,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                                                       ( -1 )\r
-#define portTICK_RATE_MS                                                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                                                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                                                     4\r
 #define portNOP()                                                                      __asm__ volatile ( "mov r0, r0" )\r
 #define portCRITICAL_NESTING_IN_TCB                                    1\r

diff --git a/FreeRTOS/Source/portable/GCC/ColdFire_V2/portmacro.h b/FreeRTOS/Source/portable/GCC/ColdFire_V2/portmacro.h
index 2545ac1270f98fe0867e9eaf4042d81177282397..9438cadbceff7f49b3cf1dec75e1f70488592d6e 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ColdFire_V2/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ColdFire_V2/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     4\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 uint32_t ulPortSetIPL( uint32_t );\r
 #define portDISABLE_INTERRUPTS()       ulPortSetIPL( configMAX_SYSCALL_INTERRUPT_PRIORITY )\r

diff --git a/FreeRTOS/Source/portable/GCC/H8S2329/portmacro.h b/FreeRTOS/Source/portable/GCC/H8S2329/portmacro.h
index 0618c981da19b39f256e375170adb9f3a0a1ed01..539617f3e72b34302aff36dda5ed201c6ca16fc9 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/H8S2329/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/H8S2329/portmacro.h
@@ -106,7 +106,7 @@ typedef unsigned char UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portYIELD()                                    asm volatile( "TRAPA #0" )\r
 #define portNOP()                                      asm volatile( "NOP" )\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/GCC/HCS12/portmacro.h b/FreeRTOS/Source/portable/GCC/HCS12/portmacro.h
index 5bf5e9a70652cca6ca7a772a1058678600051585..14cd511e5533e864b19a4e3dfbf5bd088365df2e 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/HCS12/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/HCS12/portmacro.h
@@ -107,7 +107,7 @@ typedef unsigned char UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     1\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portYIELD()                                    __asm( "swi" );\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/MCF5235/portmacro.h b/FreeRTOS/Source/portable/GCC/MCF5235/portmacro.h
index 32455c40f47b136a48a34d582149652518dc7079..ea2598bfe6214eda4866734c17b126a60668cc9e 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MCF5235/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/MCF5235/portmacro.h
@@ -81,7 +81,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* ------------------------ Architecture specifics ------------------------ */\r
 #define portSTACK_GROWTH                ( -1 )\r
-#define portTICK_RATE_MS                ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT              4\r
 \r
 #define portTRAP_YIELD                  0   /* Trap 0 */\r

diff --git a/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h b/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h
index 65ac9618039edf61e9674537ffaffd26be8ce530..0c87007ecdbdcc6e0950576e078432ac3e168dca 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/MSP430F449/portmacro.h
@@ -150,7 +150,7 @@ extern void vPortYield( void ) __attribute__ ( ( naked ) );
 /* Hardwware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r

diff --git a/FreeRTOS/Source/portable/GCC/MicroBlaze/portmacro.h b/FreeRTOS/Source/portable/GCC/MicroBlaze/portmacro.h
index 5cc8c87db7249e6d47c2be9debb1cb05b7117845..7ff466e3c600e6aabd09c2015800862ccd950a25 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MicroBlaze/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/MicroBlaze/portmacro.h
@@ -144,7 +144,7 @@ void vTaskSwitchContext();
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     4\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      asm volatile ( "NOP" )\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h
index d70fd0b5bc1ce1f63d9bd32a5e6f35f8148cc3fd..9af10245c708e528957dad5da1d7f6d25472ab64 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/MicroBlazeV8/portmacro.h
@@ -155,7 +155,7 @@ extern volatile uint32_t ulTaskSwitchRequested;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     4\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      asm volatile ( "NOP" )\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/NiosII/portmacro.h b/FreeRTOS/Source/portable/GCC/NiosII/portmacro.h
index 0d1c8709041766c8e11b587ad3a35a29fd4431fd..846f0b8165e70b7e31cf719e8e4e9d83b3a11725 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/NiosII/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/NiosII/portmacro.h
@@ -106,7 +106,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                               ( -1 )\r
-#define portTICK_RATE_MS                               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                             4\r
 #define portNOP()                      asm volatile ( "NOP" )\r
 #define portCRITICAL_NESTING_IN_TCB            1\r

diff --git a/FreeRTOS/Source/portable/GCC/PPC405_Xilinx/portmacro.h b/FreeRTOS/Source/portable/GCC/PPC405_Xilinx/portmacro.h
index d67bb045c6813925e95dac9a7ead2432a665030d..bfce0281b0594681a488bfc2b87676b3af67c75a 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/PPC405_Xilinx/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/PPC405_Xilinx/portmacro.h
@@ -132,7 +132,7 @@ void vPortYield( void );
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      asm volatile ( "NOP" )\r
 \r
 /* There are 32 * 32bit floating point regieters, plus the FPSCR to save. */\r

diff --git a/FreeRTOS/Source/portable/GCC/PPC440_Xilinx/portmacro.h b/FreeRTOS/Source/portable/GCC/PPC440_Xilinx/portmacro.h
index d67bb045c6813925e95dac9a7ead2432a665030d..bfce0281b0594681a488bfc2b87676b3af67c75a 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/PPC440_Xilinx/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/PPC440_Xilinx/portmacro.h
@@ -132,7 +132,7 @@ void vPortYield( void );
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      asm volatile ( "NOP" )\r
 \r
 /* There are 32 * 32bit floating point regieters, plus the FPSCR to save. */\r

diff --git a/FreeRTOS/Source/portable/GCC/RX100/portmacro.h b/FreeRTOS/Source/portable/GCC/RX100/portmacro.h
index fefe594521d426e4b84780ad70618924240838d8..2dcf3d024868bb0f4233f64db4aae0702e34da6d 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX100/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/RX100/portmacro.h
@@ -107,7 +107,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      __asm volatile( "NOP" )\r
 \r
 /* Save clobbered register, set ITU SWINR (at address 0x872E0), read the value\r

diff --git a/FreeRTOS/Source/portable/GCC/RX600/portmacro.h b/FreeRTOS/Source/portable/GCC/RX600/portmacro.h
index bba356f07642318b09f6d67b748f25048e027f7f..cf73bb279ab37431524c835af80a3f9b320fd99a 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX600/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/RX600/portmacro.h
@@ -107,7 +107,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 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

diff --git a/FreeRTOS/Source/portable/GCC/STR75x/portmacro.h b/FreeRTOS/Source/portable/GCC/STR75x/portmacro.h
index f20feb649ab2fcf4b2648394405443e3d43938dd..3e531facd0188bf337a5abb9fc5714b0cfe5e085 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/STR75x/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/STR75x/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_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

diff --git a/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h b/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
index c0e93372540f21bfddbea46e55b92b733c70dc17..25d23b43b2c9bb7db4eadbce27d80f6bbf61398d 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
@@ -108,7 +108,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                                                       ( -1 )\r
-#define portTICK_RATE_MS                                                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                                                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                                                     4\r
 #define portNOP()                                                                      __asm volatile( " nop " )\r
 #define portCRITICAL_NESTING_IN_TCB                                    1\r

diff --git a/FreeRTOS/Source/portable/IAR/78K0R/portmacro.h b/FreeRTOS/Source/portable/IAR/78K0R/portmacro.h
index 5d880fbb6adb51317ce9f7ad80a40424c7b7dc82..c376d211e374306bc9af3dadad7861c24f22602f 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/78K0R/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/78K0R/portmacro.h
@@ -152,7 +152,7 @@ extern void vPortStart( void );
 /* Hardwware specifics. */\r
 #define portBYTE_ALIGNMENT     2\r
 #define portSTACK_GROWTH       ( -1 )\r
-#define portTICK_RATE_MS       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h
index 1d8ccdfa5caf7492ed80de7426bfed9caeb3ed6c..eff88c440ad2389045eb487f8040327ad867abc8 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA9/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
        /* Hardware specifics. */\r
        #define portSTACK_GROWTH                        ( -1 )\r
-       #define portTICK_RATE_MS                        ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+       #define portTICK_PERIOD_MS                      ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
        #define portBYTE_ALIGNMENT                      8\r
 \r
        /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h
index 0db30ee210181cf0022addfcccc65c5d5ef4e61f..fc91dc0c6b8274c9b56a99f58f3e5b6187fe188f 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM0/portmacro.h
@@ -106,7 +106,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h
index 0c75bde4544b11f2b31b423af296b18eb91d6c65..d21a3c369443d2787a6230ee4e63b5bc12669d87 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM3/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
index 75ecd35dced55520c024e2156748184c3d786a67..a83fe188b7ad1951a49fa231238aa3de33f6a9b9 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ATMega323/portmacro.h b/FreeRTOS/Source/portable/IAR/ATMega323/portmacro.h
index 2f4c05aa74985f221725d640a4b4def6573446ff..c2b963629c7a148c6009204f181d6d2edb74853c 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ATMega323/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ATMega323/portmacro.h
@@ -123,7 +123,7 @@ extern void vPortExitCritical( void );
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     1\r
 #define portNOP()                                      asm( "nop" )\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/IAR/AVR32_UC3/portmacro.h b/FreeRTOS/Source/portable/IAR/AVR32_UC3/portmacro.h
index e4b793a6127c8faf8d5d8918002e7963bb094974..0070b6707ffe6d7896f4647323a496d57dd030ee 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/AVR32_UC3/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/AVR32_UC3/portmacro.h
@@ -114,9 +114,9 @@ typedef long BaseType_t;
 typedef unsigned long UBaseType_t;\r
 \r
 \r
-#define TASK_DELAY_MS(x)   ( (x)        /portTICK_RATE_MS )\r
-#define TASK_DELAY_S(x)    ( (x)*1000   /portTICK_RATE_MS )\r
-#define TASK_DELAY_MIN(x)  ( (x)*60*1000/portTICK_RATE_MS )\r
+#define TASK_DELAY_MS(x)   ( (x)        /portTICK_PERIOD_MS )\r
+#define TASK_DELAY_S(x)    ( (x)*1000   /portTICK_PERIOD_MS )\r
+#define TASK_DELAY_MIN(x)  ( (x)*60*1000/portTICK_PERIOD_MS )\r
 \r
 #define configTICK_TC_IRQ             ATPASTE2(AVR32_TC_IRQ, configTICK_TC_CHANNEL)\r
 \r
@@ -131,7 +131,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH      ( -1 )\r
-#define portTICK_RATE_MS      ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS      ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT       4\r
 #define portNOP()             {__asm__ __volatile__ ("nop");}\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c
index 8526e73e63556da35455f86064baeffc292a3f6d..9b8c47c3ce76f222f625104539718fa9af011165 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c
+++ b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/port.c
@@ -82,7 +82,7 @@
 \r
 /* Constants required to setup the PIT. */\r
 #define portPIT_CLOCK_DIVISOR                  ( ( uint32_t ) 16 )\r
-#define portPIT_COUNTER_VALUE                  ( ( ( configCPU_CLOCK_HZ / portPIT_CLOCK_DIVISOR ) / 1000UL ) * portTICK_RATE_MS )\r
+#define portPIT_COUNTER_VALUE                  ( ( ( configCPU_CLOCK_HZ / portPIT_CLOCK_DIVISOR ) / 1000UL ) * portTICK_PERIOD_MS )\r
 \r
 /* Constants required to handle critical sections. */\r
 #define portNO_CRITICAL_NESTING                ( ( uint32_t ) 0 )\r

diff --git a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/portmacro.h b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/portmacro.h
index 019eae2098916f87dbb16e14f287142f147fd4ff..fefcee61aaa1bbac95576160c8d79e519f3b3410 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portYIELD()                                    asm ( "SWI 0" )\r
 #define portNOP()                                      asm ( "NOP" )\r

diff --git a/FreeRTOS/Source/portable/IAR/AtmelSAM9XE/portmacro.h b/FreeRTOS/Source/portable/IAR/AtmelSAM9XE/portmacro.h
index 9f07ab580fafcb07da921e7c4e0ac59206be8857..c35757efa64f39b6f6c49bea3381d73f7ab3fc8f 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/AtmelSAM9XE/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/AtmelSAM9XE/portmacro.h
@@ -108,7 +108,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portYIELD()                                    asm ( "SWI 0" )\r
 #define portNOP()                                      asm ( "NOP" )\r

diff --git a/FreeRTOS/Source/portable/IAR/LPC2000/port.c b/FreeRTOS/Source/portable/IAR/LPC2000/port.c
index b60094d1318036af982ec293978523d3607449ba..2003bd2f8a3359c970820edd51569178e3ab279a 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/LPC2000/port.c
+++ b/FreeRTOS/Source/portable/IAR/LPC2000/port.c
@@ -96,7 +96,7 @@
 \r
 /* Constants required to setup the PIT. */\r
 #define portPIT_CLOCK_DIVISOR                  ( ( uint32_t ) 16 )\r
-#define portPIT_COUNTER_VALUE                  ( ( ( configCPU_CLOCK_HZ / portPIT_CLOCK_DIVISOR ) / 1000UL ) * portTICK_RATE_MS )\r
+#define portPIT_COUNTER_VALUE                  ( ( ( configCPU_CLOCK_HZ / portPIT_CLOCK_DIVISOR ) / 1000UL ) * portTICK_PERIOD_MS )\r
 \r
 /* Constants required to handle interrupts. */\r
 #define portTIMER_MATCH_ISR_BIT                ( ( uint8_t ) 0x01 )\r

diff --git a/FreeRTOS/Source/portable/IAR/LPC2000/portmacro.h b/FreeRTOS/Source/portable/IAR/LPC2000/portmacro.h
index e3040aa12bf3f1707271253b4bf3cc23a3ffd12f..28cb80ac315786146c517bcfda5e236386ec17e2 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/LPC2000/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/LPC2000/portmacro.h
@@ -108,7 +108,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portYIELD()                                    asm ( "SWI 0" )\r
 #define portNOP()                                      asm ( "NOP" )\r

diff --git a/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h b/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h
index 924e4ab57fa7e30c63857e11a77fac3cb26b1765..cb7ebe8718832b623757f7c2ecc10880e39ff9f0 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/MSP430/portmacro.h
@@ -151,7 +151,7 @@ extern void vPortYield( void );
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
index 69c4055950af240c33e26d2a5610a80915e01c25..b6c7ab72c292b7d117e646d0912cdbaed3175032 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/MSP430X/portmacro.h
@@ -159,7 +159,7 @@ extern void vPortYield( void );
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      __no_operation()\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/RL78/portmacro.h b/FreeRTOS/Source/portable/IAR/RL78/portmacro.h
index dd314e12af4274733b00fc3b19784bd7b35f42ef..ca9201a7a5e32e8000aaa950f8762114800520c2 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/RL78/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/RL78/portmacro.h
@@ -167,7 +167,7 @@ extern volatile uint16_t usCriticalNesting;                                                         \
 /* Hardwware specifics. */\r
 #define portBYTE_ALIGNMENT     2\r
 #define portSTACK_GROWTH       ( -1 )\r
-#define portTICK_RATE_MS       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r

diff --git a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
index b86ea11c18161bb0fd870706dff45181b547bf2d..35f72643cc634844650f0fbe3868e510247b490c 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
@@ -113,7 +113,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      __no_operation()\r
 \r
 #define portYIELD()                                                    \\r

diff --git a/FreeRTOS/Source/portable/IAR/RX600/portmacro.h b/FreeRTOS/Source/portable/IAR/RX600/portmacro.h
index 0b28484bb5ee7caabab1028965ba7a54bb8da3c4..266e8013e555c7bcfdbb271db12e5eadd760d6ef 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/RX600/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/RX600/portmacro.h
@@ -110,7 +110,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                      __no_operation()\r
 \r
 /* Yield equivalent to "*portITU_SWINTR = 0x01; ( void ) *portITU_SWINTR;"\r

diff --git a/FreeRTOS/Source/portable/IAR/STR71x/portmacro.h b/FreeRTOS/Source/portable/IAR/STR71x/portmacro.h
index 8b5aec10a446d2201e832238dde451e44527f1c9..f80a6554f8266fdbe29e0a8e4521d8e5f05cc411 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/STR71x/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/STR71x/portmacro.h
@@ -109,7 +109,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portYIELD()                                    asm ( "SWI 0" )\r
 #define portNOP()                                      asm ( "NOP" )\r

diff --git a/FreeRTOS/Source/portable/IAR/STR75x/portmacro.h b/FreeRTOS/Source/portable/IAR/STR75x/portmacro.h
index f6bd58d323f03302203b0f238dd5b44f1c7cf74c..161952549b3c3ab61517ea317e2a89c2ad95029b 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/STR75x/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/STR75x/portmacro.h
@@ -108,7 +108,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portYIELD()                                    asm ( "SWI 0" )\r
 #define portNOP()                                      asm ( "NOP" )\r

diff --git a/FreeRTOS/Source/portable/IAR/STR91x/portmacro.h b/FreeRTOS/Source/portable/IAR/STR91x/portmacro.h
index d6633f3de6fd9998065f3dd819dcc3858c81c3b3..2f63c45871880fdf46e98ffdace4de76a08c9227 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/STR91x/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/STR91x/portmacro.h
@@ -108,7 +108,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portYIELD()                                    asm ( "SWI 0" )\r
 #define portNOP()                                      asm ( "NOP" )\r

diff --git a/FreeRTOS/Source/portable/IAR/V850ES/portmacro.h b/FreeRTOS/Source/portable/IAR/V850ES/portmacro.h
index c9b6e757983af9f9332bac49d6ba0264c2268be8..668b888a7d7dd3f20dd172f3cc0c36a27c7435ac 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/V850ES/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/V850ES/portmacro.h
@@ -157,7 +157,7 @@ extern void vTaskSwitchContext( void );
 /* Hardwware specifics. */\r
 #define portBYTE_ALIGNMENT     4\r
 #define portSTACK_GROWTH       ( -1 )\r
-#define portTICK_RATE_MS       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h b/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h
index 44e153600e6def61b357a99738a3d9e4b6950b0c..d955c76e60997ed66c742db9c15aefb12f075662 100644 (file)
--- a/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h
+++ b/FreeRTOS/Source/portable/MPLAB/PIC18F/portmacro.h
@@ -102,7 +102,7 @@ typedef unsigned char UBaseType_t;
 #define portBYTE_ALIGNMENT                     1\r
 #define portGLOBAL_INT_ENABLE_BIT      0x80\r
 #define portSTACK_GROWTH                       1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section management. */\r

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h b/FreeRTOS/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
index d0ad6d1948c2c9b193e9c48aaa55bf63948d5837..77a4df35c64a6273c28096a18d106f77614b2cdd 100644 (file)
--- a/FreeRTOS/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
+++ b/FreeRTOS/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned short UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section management. */\r

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC32MX/portmacro.h b/FreeRTOS/Source/portable/MPLAB/PIC32MX/portmacro.h
index 23da9443ebb33a21807adcf9d91966de9a1095f2..5ad0698de8657fd4350c529a42a4b8eafa4e3a36 100644 (file)
--- a/FreeRTOS/Source/portable/MPLAB/PIC32MX/portmacro.h
+++ b/FreeRTOS/Source/portable/MPLAB/PIC32MX/portmacro.h
@@ -108,7 +108,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section management. */\r

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h b/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h
index fd91e8cae0b2ef5f4f49dc29a75b628f3ddb2e11..14b045ce616c58aed6368051d2f9ab49fd7a2b79 100644 (file)
--- a/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h
+++ b/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h
@@ -108,7 +108,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8\r
 #define portSTACK_GROWTH                       -1\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section management. */\r

diff --git a/FreeRTOS/Source/portable/MSVC-MingW/port.c b/FreeRTOS/Source/portable/MSVC-MingW/port.c
index f13860f2ef7476dda0a725e136547e0a236a08ac..b79b45a8152de9d72d43a356dc885ca8a6c74fd7 100644 (file)
--- a/FreeRTOS/Source/portable/MSVC-MingW/port.c
+++ b/FreeRTOS/Source/portable/MSVC-MingW/port.c
@@ -184,13 +184,13 @@ TIMECAPS xTimeCaps;
                time, not the time that Sleep() is called.  It is done this way to\r
                prevent overruns in this very non real time simulated/emulated\r
                environment. */\r
-               if( portTICK_RATE_MS < xMinimumWindowsBlockTime )\r
+               if( portTICK_PERIOD_MS < xMinimumWindowsBlockTime )\r
                {\r
                        Sleep( xMinimumWindowsBlockTime );\r
                }\r
                else\r
                {\r
-                       Sleep( portTICK_RATE_MS );\r
+                       Sleep( portTICK_PERIOD_MS );\r
                }\r
 \r
                configASSERT( xPortRunning );\r

diff --git a/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h b/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
index 626f10dd873beaac8716f3ad2a10ff0bb834a57b..fb98a6d99905345bb9ec861b6a746ad0ba5d8b0c 100644 (file)
--- a/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
+++ b/FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
@@ -95,7 +95,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     4\r
 \r
 #define portYIELD()                                    vPortGenerateSimulatedInterrupt( portINTERRUPT_YIELD )\r

diff --git a/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h b/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h
index bebf689931389b974bea468bf73510113524cd77..f713a0a836370803115b36438a165685dec86915 100644 (file)
--- a/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h
+++ b/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h
@@ -119,7 +119,7 @@ typedef unsigned short UBaseType_t;
 #define portSTACK_GROWTH                               ( -1 )\r
 #define portSWITCH_INT_NUMBER                  0x80\r
 #define portYIELD()                                            __asm{ int portSWITCH_INT_NUMBER }\r
-#define portTICK_RATE_MS                               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                             2\r
 #define portINITIAL_SW                                 ( ( portSTACK_TYPE ) 0x0202 )   /* Start the tasks with interrupts enabled. */\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/Paradigm/Tern_EE/small/portmacro.h b/FreeRTOS/Source/portable/Paradigm/Tern_EE/small/portmacro.h
index 85584ad9dae70119a8f7179d17cf435b1a45c30c..2cc95e9e6c490b4c4900bde71bc3308e56e10bf7 100644 (file)
--- a/FreeRTOS/Source/portable/Paradigm/Tern_EE/small/portmacro.h
+++ b/FreeRTOS/Source/portable/Paradigm/Tern_EE/small/portmacro.h
@@ -121,7 +121,7 @@ typedef void ( __interrupt __far *pxISR )();
 #define portSTACK_GROWTH                               ( -1 )\r
 #define portSWITCH_INT_NUMBER                  0x80\r
 #define portYIELD()                                            __asm{ int portSWITCH_INT_NUMBER }\r
-#define portTICK_RATE_MS                               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                             2\r
 #define portINITIAL_SW                                 ( ( portSTACK_TYPE ) 0x0202 )   /* Start the tasks with interrupts enabled. */\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
index 8976192e93cac36944ec8debf4ce9e5a05cd3027..051602e8b3947000b9f2fce0fdb76a0c437a6c95 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
@@ -106,7 +106,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h
index 29cb6f091a7bd93c8293ece07389557ac031a6c6..da194a4925a6940d9a67800f3ed6406863e78add 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CA9/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Hardware specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 \r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM0/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM0/portmacro.h
index c80a26e101e6186724838d8f3ea6263548502aaa..13b1a79bbabff3ac6559778c6f35a1936f57b347 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM0/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM0/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h
index 4d75be76ef48ab0fc1145ea6879cd19ec3a0b866..c07963786df62f1b13a07842cd3f3950db1b633e 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM3/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
index f40fa78fc99a5b515d433adb8fd1577da672a473..2e26f6a8ded4c3d083fc8d7c5bab36abce79dd6b 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
@@ -105,7 +105,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h
index 93b6e284681b12a884a0fa08d1bd622010dd4079..0cb326fb0c51fc10ed6f2c6bca58ebaef7ec5bf4 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h
+++ b/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h
@@ -110,7 +110,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                             8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                               -1\r
-#define portTICK_RATE_MS                               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                              nop()\r
 \r
 #pragma inline_asm vPortYield\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h
index c9915d857c8495879f1b1ab9be0b4d55becc3899..cd7baf95c215e851a2ab2f726175712f4d7f72ba 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h
+++ b/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h
@@ -110,7 +110,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                             8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                               -1\r
-#define portTICK_RATE_MS                               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                              nop()\r
 \r
 #pragma inline_asm vPortYield\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h
index d1573581c552df796d808c5dfee891bcf4bba336..c068b4c3c3f561a77434bd514fd637b47d6cb1a4 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h
+++ b/FreeRTOS/Source/portable/Renesas/RX600/portmacro.h
@@ -110,7 +110,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                             8       /* Could make four, according to manual. */\r
 #define portSTACK_GROWTH                               -1\r
-#define portTICK_RATE_MS                               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                              nop()\r
 \r
 \r

diff --git a/FreeRTOS/Source/portable/Renesas/SH2A_FPU/portmacro.h b/FreeRTOS/Source/portable/Renesas/SH2A_FPU/portmacro.h
index b47f88d973d5d3a7d8fd979b04eb1a59218d64cb..77ae3f8c06c1eb722654b6fda230e3d1d43daf6b 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/SH2A_FPU/portmacro.h
+++ b/FreeRTOS/Source/portable/Renesas/SH2A_FPU/portmacro.h
@@ -109,7 +109,7 @@ typedef unsigned long UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                             8\r
 #define portSTACK_GROWTH                               -1\r
-#define portTICK_RATE_MS                               ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()                                              nop()\r
 #define portSTART_SCHEDULER_TRAP_NO            ( 32 )\r
 #define portYIELD_TRAP_NO                              ( 33 )\r

diff --git a/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h b/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h
index 7f6efd7cf27d3b98942f241607320be9d9c5ddac..ef4442d15af99bedc329af6497924aa5bc71f38c 100644 (file)
--- a/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h
+++ b/FreeRTOS/Source/portable/Rowley/MSP430F449/portmacro.h
@@ -151,7 +151,7 @@ extern void vPortYield( void );
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portNOP()\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/SDCC/Cygnal/portmacro.h b/FreeRTOS/Source/portable/SDCC/Cygnal/portmacro.h
index 9c96631b7126f4d8f057ec3e6f3f61cebfe608d4..6673a562133e9b37af91585a252ca2a861168f5d 100644 (file)
--- a/FreeRTOS/Source/portable/SDCC/Cygnal/portmacro.h
+++ b/FreeRTOS/Source/portable/SDCC/Cygnal/portmacro.h
@@ -130,7 +130,7 @@ typedef unsigned char UBaseType_t;
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     1\r
 #define portSTACK_GROWTH                       ( 1 )\r
-#define portTICK_RATE_MS                       ( ( uint32_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( uint32_t ) 1000 / configTICK_RATE_HZ )\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task utilities. */\r

diff --git a/FreeRTOS/Source/portable/Softune/MB91460/portmacro.h b/FreeRTOS/Source/portable/Softune/MB91460/portmacro.h
index b4fdd9aa351810ddae1ba765ac6024a8f6b39d11..89acab0e6227aab6ce0b782e5ea318c1c365ffa5 100644 (file)
--- a/FreeRTOS/Source/portable/Softune/MB91460/portmacro.h
+++ b/FreeRTOS/Source/portable/Softune/MB91460/portmacro.h
@@ -124,7 +124,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     4\r
 #define portNOP()                                      __asm( " nop " );\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/Softune/MB96340/portmacro.h b/FreeRTOS/Source/portable/Softune/MB96340/portmacro.h
index fd3b8262ecc513b127449f7fddf49011ec9534a2..c8878b828a0e17776828465ce0a4ea73640b4711 100644 (file)
--- a/FreeRTOS/Source/portable/Softune/MB96340/portmacro.h
+++ b/FreeRTOS/Source/portable/Softune/MB96340/portmacro.h
@@ -131,7 +131,7 @@ typedef unsigned short UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     2\r
 #define portNOP()                                      __asm( " NOP " );\r
 /*-----------------------------------------------------------*/\r

diff --git a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
index 1d51fd4ed4e2159e04fe30277a43bff2606762ab..27d4dd0ec5e87c62d832f95b2fe3ba6296ab6456 100644 (file)
--- a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
@@ -106,7 +106,7 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/WizC/PIC18/portmacro.h b/FreeRTOS/Source/portable/WizC/PIC18/portmacro.h
index cae0dffa4c8bbcd7640a20e6b3b46be298cabbbb..b1922823730326fa602b9c08e9f11e40d1e5fb36 100644 (file)
--- a/FreeRTOS/Source/portable/WizC/PIC18/portmacro.h
+++ b/FreeRTOS/Source/portable/WizC/PIC18/portmacro.h
@@ -433,7 +433,7 @@ extern uint16_t usCalcMinStackSize;
 \r
 /*-----------------------------------------------------------*/\r
 \r
-#define portTICK_RATE_MS       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 \r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h b/FreeRTOS/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h
index 1819f0d0d3b2d8a9695eb0205cd417725b1b9487..734fba8e08ec6ee5898ae5dfc54a47a01cabdcaf 100644 (file)
--- a/FreeRTOS/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h
+++ b/FreeRTOS/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h
@@ -123,7 +123,7 @@ void portENABLE_INTERRUPTS( void );
 #define portSTACK_GROWTH        ( -1 )\r
 #define portSWITCH_INT_NUMBER   0x80\r
 #define portYIELD()             __asm{ int portSWITCH_INT_NUMBER }\r
-#define portTICK_RATE_MS        ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS        ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT      2\r
 #define portINITIAL_SW          ( ( portSTACK_TYPE ) 0x0202 )   /* Start the tasks with interrupts enabled. */\r
 #define portNOP()                              __asm{ nop }\r

diff --git a/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/portmacro.h b/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/portmacro.h
index 242f0977b3606a04bca91dde817b090e800a0b91..e1d6047ff577e22885c816b05f94b6f19aa93522 100644 (file)
--- a/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/portmacro.h
+++ b/FreeRTOS/Source/portable/oWatcom/16BitDOS/PC/portmacro.h
@@ -125,7 +125,7 @@ void portENABLE_INTERRUPTS( void );
 #define portSWITCH_INT_NUMBER  0x80\r
 #define portYIELD()                            __asm{ int portSWITCH_INT_NUMBER }\r
 #define portDOS_TICK_RATE              ( 18.20648 )\r
-#define portTICK_RATE_MS        ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS        ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portTICKS_PER_DOS_TICK ( ( uint16_t ) ( ( ( portDOUBLE ) configTICK_RATE_HZ / portDOS_TICK_RATE ) + 0.5 ) )\r
 #define portINITIAL_SW                 ( ( portSTACK_TYPE ) 0x0202 )   /* Start the tasks with interrupts enabled. */\r
 #define portBYTE_ALIGNMENT             ( 2 )\r