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

[freertos] / FreeRTOS / Demo / Common / ethernet / lwIP_130 / contrib / port / FreeRTOS / sys_arch.c

diff --git a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c
index bd7ff38fbcbc05149ffc7dd6811e4a5ee1268700..4f781c11a1d78af7c36e82f358b0da801e9f4886 100644 (file)
--- a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c
+++ b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c
@@ -40,7 +40,7 @@
 struct timeoutlist\r
 {\r
        struct sys_timeouts timeouts;\r
-       xTaskHandle pid;\r
+       TaskHandle_t pid;\r
 };\r
 \r
 /* This is the number of threads that can be started with sys_thread_new() */\r
@@ -54,7 +54,7 @@ static u16_t s_nextthread = 0;
 //  Creates an empty mailbox.\r
 sys_mbox_t sys_mbox_new(int size)\r
 {\r
-       xQueueHandle mbox;\r
+       QueueHandle_t mbox;\r
 \r
        ( void ) size;\r
 \r
@@ -146,7 +146,7 @@ err_t result;
 u32_t sys_arch_mbox_fetch(sys_mbox_t mbox, void **msg, u32_t timeout)\r
 {\r
 void *dummyptr;\r
-portTickType StartTime, EndTime, Elapsed;\r
+TickType_t StartTime, EndTime, Elapsed;\r
 \r
        StartTime = xTaskGetTickCount();\r
 \r
@@ -157,10 +157,10 @@ portTickType StartTime, EndTime, Elapsed;
 \r
        if ( timeout != 0 )\r
        {\r
-               if ( pdTRUE == xQueueReceive( mbox, &(*msg), timeout / portTICK_RATE_MS ) )\r
+               if ( pdTRUE == xQueueReceive( mbox, &(*msg), timeout / portTICK_PERIOD_MS ) )\r
                {\r
                        EndTime = xTaskGetTickCount();\r
-                       Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;\r
+                       Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;\r
 \r
                        return ( Elapsed );\r
                }\r
@@ -175,7 +175,7 @@ portTickType StartTime, EndTime, Elapsed;
        {\r
                while( pdTRUE != xQueueReceive( mbox, &(*msg), portMAX_DELAY ) ){} // time is arbitrary\r
                EndTime = xTaskGetTickCount();\r
-               Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;\r
+               Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;\r
 \r
                return ( Elapsed ); // return time blocked TODO test\r
        }\r
@@ -210,7 +210,7 @@ void *dummyptr;
 //  the initial state of the semaphore.\r
 sys_sem_t sys_sem_new(u8_t count)\r
 {\r
-       xSemaphoreHandle  xSemaphore;\r
+       SemaphoreHandle_t  xSemaphore;\r
 \r
        vSemaphoreCreateBinary( xSemaphore );\r
 \r
@@ -257,16 +257,16 @@ sys_sem_t sys_sem_new(u8_t count)
 */\r
 u32_t sys_arch_sem_wait(sys_sem_t sem, u32_t timeout)\r
 {\r
-portTickType StartTime, EndTime, Elapsed;\r
+TickType_t StartTime, EndTime, Elapsed;\r
 \r
        StartTime = xTaskGetTickCount();\r
 \r
        if(     timeout != 0)\r
        {\r
-               if( xSemaphoreTake( sem, timeout / portTICK_RATE_MS ) == pdTRUE )\r
+               if( xSemaphoreTake( sem, timeout / portTICK_PERIOD_MS ) == pdTRUE )\r
                {\r
                        EndTime = xTaskGetTickCount();\r
-                       Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;\r
+                       Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;\r
 \r
                        return (Elapsed); // return time blocked TODO test\r
                }\r
@@ -279,7 +279,7 @@ portTickType StartTime, EndTime, Elapsed;
        {\r
                while( xSemaphoreTake( sem, portMAX_DELAY ) != pdTRUE ){}\r
                EndTime = xTaskGetTickCount();\r
-               Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;\r
+               Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;\r
 \r
                return ( Elapsed ); // return time blocked\r
 \r
@@ -337,7 +337,7 @@ void sys_init(void)
 struct sys_timeouts *sys_arch_timeouts(void)\r
 {\r
 int i;\r
-xTaskHandle pid;\r
+TaskHandle_t pid;\r
 struct timeoutlist *tl;\r
 \r
        pid = xTaskGetCurrentTaskHandle( );\r
@@ -367,7 +367,7 @@ struct timeoutlist *tl;
 */\r
 sys_thread_t sys_thread_new(char *name, void (* thread)(void *arg), void *arg, int stacksize, int prio)\r
 {\r
-xTaskHandle CreatedTask;\r
+TaskHandle_t CreatedTask;\r
 int result;\r
 \r
    if ( s_nextthread < SYS_THREAD_MAX )\r