Update the demo directory to use the version 8 type naming conventions.

[freertos] / FreeRTOS / Demo / lwIP_MCF5235_GCC / lwip / contrib / port / FreeRTOS / MCF5235 / sys_arch.c

diff --git a/FreeRTOS/Demo/lwIP_MCF5235_GCC/lwip/contrib/port/FreeRTOS/MCF5235/sys_arch.c b/FreeRTOS/Demo/lwIP_MCF5235_GCC/lwip/contrib/port/FreeRTOS/MCF5235/sys_arch.c
index 2962864dff70b86d966b664bc86f266c951e506d..566607894ea92b73800265f52cefa659d3030a7b 100644 (file)
--- a/FreeRTOS/Demo/lwIP_MCF5235_GCC/lwip/contrib/port/FreeRTOS/MCF5235/sys_arch.c
+++ b/FreeRTOS/Demo/lwIP_MCF5235_GCC/lwip/contrib/port/FreeRTOS/MCF5235/sys_arch.c
@@ -58,16 +58,16 @@
 /* This is the number of threads that can be started with sys_thead_new() */\r
 #define SYS_MBOX_SIZE               ( 16 )\r
 #define MS_TO_TICKS( ms )           \\r
-    ( portTickType )( ( portTickType ) ( ms ) / portTICK_RATE_MS )\r
+    ( TickType_t )( ( TickType_t ) ( ms ) / portTICK_PERIOD_MS )\r
 #define TICKS_TO_MS( ticks )        \\r
-    ( unsigned long )( ( portTickType ) ( ticks ) * portTICK_RATE_MS )\r
+    ( unsigned long )( ( TickType_t ) ( ticks ) * portTICK_PERIOD_MS )\r
 #define THREAD_STACK_SIZE           ( 1024 )\r
 #define THREAD_NAME                 "lwIP"\r
 \r
 #define THREAD_INIT( tcb ) \\r
     do { \\r
         tcb->next = NULL; \\r
-        tcb->pid = ( xTaskHandle )0; \\r
+        tcb->pid = ( TaskHandle_t )0; \\r
         tcb->timeouts.next = NULL; \\r
     } while( 0 )\r
 \r
@@ -76,7 +76,7 @@ typedef struct sys_tcb
 {\r
     struct sys_tcb *next;\r
     struct sys_timeouts timeouts;\r
-    xTaskHandle     pid;\r
+    TaskHandle_t     pid;\r
 } sys_tcb_t;\r
 \r
 /* ------------------------ Prototypes ------------------------------------ */\r
@@ -232,7 +232,7 @@ sys_arch_thread_remove( sys_thread_t hdl )
 {\r
     sys_tcb_t      *current = tasks, *prev;\r
     sys_tcb_t      *toremove = hdl;\r
-    xTaskHandle     pid = ( xTaskHandle ) 0;\r
+    TaskHandle_t     pid = ( TaskHandle_t ) 0;\r
 \r
     LWIP_ASSERT( "sys_arch_thread_remove: assertion hdl != NULL failed!", hdl != NULL );\r
 \r
@@ -270,7 +270,7 @@ sys_arch_thread_remove( sys_thread_t hdl )
      * resources.\r
      */\r
     vPortExitCritical(  );\r
-    if( pid != ( xTaskHandle ) 0 )\r
+    if( pid != ( TaskHandle_t ) 0 )\r
     {\r
         vTaskDelete( pid );\r
         /* not reached. */\r
@@ -285,7 +285,7 @@ sys_thread_t
 sys_arch_thread_current( void )\r
 {\r
     sys_tcb_t      *p = tasks;\r
-    xTaskHandle     pid = xTaskGetCurrentTaskHandle(  );\r
+    TaskHandle_t     pid = xTaskGetCurrentTaskHandle(  );\r
 \r
     vPortEnterCritical(  );\r
     while( ( p != NULL ) && ( p->pid != pid ) )\r
@@ -325,7 +325,7 @@ sys_arch_timeouts( void )
 sys_sem_t\r
 sys_sem_new( u8_t count )\r
 {\r
-    xSemaphoreHandle xSemaphore;\r
+    SemaphoreHandle_t xSemaphore;\r
 \r
     vSemaphoreCreateBinary( xSemaphore );\r
     if( xSemaphore != SYS_SEM_NULL )\r
@@ -395,7 +395,7 @@ u32_t
 sys_arch_sem_wait( sys_sem_t sem, u32_t timeout )\r
 {\r
     portBASE_TYPE   xStatus;\r
-    portTickType    xTicksStart, xTicksEnd, xTicksElapsed;\r
+    TickType_t    xTicksStart, xTicksEnd, xTicksElapsed;\r
     u32_t           timespent;\r
 \r
     LWIP_ASSERT( "sys_arch_sem_wait: sem != SYS_SEM_NULL", sem != SYS_SEM_NULL );\r
@@ -434,7 +434,7 @@ sys_arch_sem_wait( sys_sem_t sem, u32_t timeout )
 sys_mbox_t\r
 sys_mbox_new( void )\r
 {\r
-    xQueueHandle    mbox;\r
+    QueueHandle_t    mbox;\r
 \r
     mbox = xQueueCreate( SYS_MBOX_SIZE, sizeof( void * ) );\r
     if( mbox != SYS_MBOX_NULL )\r
@@ -513,7 +513,7 @@ sys_arch_mbox_fetch( sys_mbox_t mbox, void **msg, u32_t timeout )
 {\r
     void           *ret_msg;\r
     portBASE_TYPE   xStatus;\r
-    portTickType    xTicksStart, xTicksEnd, xTicksElapsed;\r
+    TickType_t    xTicksStart, xTicksEnd, xTicksElapsed;\r
     u32_t           timespent;\r
 \r
     LWIP_ASSERT( "sys_arch_mbox_fetch: mbox != SYS_MBOX_NULL", mbox != SYS_MBOX_NULL );\r
@@ -555,7 +555,7 @@ sys_arch_mbox_fetch( sys_mbox_t mbox, void **msg, u32_t timeout )
 u32_t\r
 sys_jiffies( void )\r
 {\r
-    portTickType    xTicks = xTaskGetTickCount(  );\r
+    TickType_t    xTicks = xTaskGetTickCount(  );\r
 \r
     return ( u32_t )TICKS_TO_MS( xTicks );\r
 }\r