Update FreeRTOS+ components and demos to use typedef names introduced in FreeRTOS V8.

[freertos] / FreeRTOS-Plus / Source / FreeRTOS-Plus-UDP / portable / NetworkInterface / SAM4E / NetworkInterface.c

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c
index 7fa9d149cc3811019feee8eb9e8ba871f1544970..670c878135734ff6d2ea7c4cc798d3ab1fdfd0b7 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c
@@ -61,7 +61,7 @@
 operation will be held in the Blocked state (so other tasks can execute) for\r
 niTX_BUFFER_FREE_WAIT ticks.  It will do this a maximum of niMAX_TX_ATTEMPTS\r
 before giving up. */\r
-#define niTX_BUFFER_FREE_WAIT  ( ( portTickType ) 2UL / portTICK_RATE_MS )\r
+#define niTX_BUFFER_FREE_WAIT  ( ( TickType_t ) 2UL / portTICK_RATE_MS )\r
 #define niMAX_TX_ATTEMPTS              ( 5 )\r
 \r
 /*-----------------------------------------------------------*/\r
@@ -90,12 +90,12 @@ static gmac_device_t xGMACStruct;
 \r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xNetworkInterfaceInitialise( void )\r
+BaseType_t xNetworkInterfaceInitialise( void )\r
 {\r
 gmac_options_t xGMACOptions;\r
 extern uint8_t ucMACAddress[ 6 ];\r
-const portTickType xPHYDelay_400ms = 400UL;\r
-portBASE_TYPE xReturn = pdFALSE;\r
+const TickType_t xPHYDelay_400ms = 400UL;\r
+BaseType_t xReturn = pdFALSE;\r
 \r
        /* Ensure PHY is ready. */\r
        vTaskDelay( xPHYDelay_400ms / portTICK_RATE_MS );\r
@@ -167,7 +167,7 @@ portBASE_TYPE xReturn = pdFALSE;
 \r
 static void prvGMACRxCallback( uint32_t ulStatus )\r
 {\r
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
+BaseType_t xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        /* Unblock the deferred interrupt handler task if the event was an Rx. */\r
        if( ulStatus == GMAC_RSR_REC )\r
@@ -179,9 +179,9 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xNetworkInterfaceOutput( xNetworkBufferDescriptor_t * const pxNetworkBuffer )\r
+BaseType_t xNetworkInterfaceOutput( xNetworkBufferDescriptor_t * const pxNetworkBuffer )\r
 {\r
-portBASE_TYPE xReturn = pdFAIL;\r
+BaseType_t xReturn = pdFAIL;\r
 int32_t x;\r
 \r
        /* Attempt to obtain access to a Tx descriptor. */\r
@@ -217,7 +217,7 @@ static void prvGMACDeferredInterruptHandlerTask( void *pvParameters )
 {\r
 xNetworkBufferDescriptor_t *pxNetworkBuffer;\r
 xIPStackEvent_t xRxEvent = { eEthernetRxEvent, NULL };\r
-static const portTickType xBufferWaitDelay = 1500UL / portTICK_RATE_MS;\r
+static const TickType_t xBufferWaitDelay = 1500UL / portTICK_RATE_MS;\r
 uint32_t ulReturned;\r
 \r
        ( void ) pvParameters;\r
@@ -268,7 +268,7 @@ uint32_t ulReturned;
                                        /* Data was received and stored.  Send it to the IP task\r
                                        for processing. */\r
                                        xRxEvent.pvData = ( void * ) pxNetworkBuffer;\r
-                                       if( xQueueSendToBack( xNetworkEventQueue, &xRxEvent, ( portTickType ) 0 ) == pdFALSE )\r
+                                       if( xQueueSendToBack( xNetworkEventQueue, &xRxEvent, ( TickType_t ) 0 ) == pdFALSE )\r
                                        {\r
                                                /* The buffer could not be sent to the IP task so the\r
                                                buffer must be released. */\r