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

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

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c
index a1c7cd5e99bc4bdc5d538225429fe719501ee49f..1983d85323804a50050e232b9701d6360f2b0dbe 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+UDP V1.0.1 (C) 2013 Real Time Engineers ltd.\r
+ * FreeRTOS+UDP V1.0.3 (C) 2014 Real Time Engineers ltd.\r
  * All rights reserved\r
  *\r
  * This file is part of the FreeRTOS+UDP distribution.  The FreeRTOS+UDP license\r
@@ -19,9 +19,9 @@
  *\r
  * - Commercial licensing -\r
  * Businesses and individuals that for commercial or other reasons cannot comply\r
- * with the terms of the GPL V2 license must obtain a commercial license before \r
- * incorporating FreeRTOS+UDP into proprietary software for distribution in any \r
- * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp \r
+ * with the terms of the GPL V2 license must obtain a commercial license before\r
+ * incorporating FreeRTOS+UDP into proprietary software for distribution in any\r
+ * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp\r
  * and do not require any source files to be changed.\r
  *\r
  * FreeRTOS+UDP is distributed in the hope that it will be useful.  You cannot\r
@@ -71,7 +71,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
@@ -92,10 +92,10 @@ static xSemaphoreHandle xEMACRxEventSemaphore = NULL;
 \r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xNetworkInterfaceInitialise( void )\r
+BaseType_t xNetworkInterfaceInitialise( void )\r
 {\r
 EMAC_CFG_Type Emac_Config;\r
-portBASE_TYPE xReturn;\r
+BaseType_t xReturn;\r
 extern uint8_t ucMACAddress[ 6 ];\r
 \r
        Emac_Config.pbEMAC_Addr = ucMACAddress;\r
@@ -124,7 +124,7 @@ extern uint8_t ucMACAddress[ 6 ];
                possible priority to ensure the interrupt handler can return directly to\r
                it no matter which task was running when the interrupt occurred. */\r
                xTaskCreate(    prvEMACDeferredInterruptHandlerTask,            /* The function that implements the task. */\r
-                                               ( const signed char * const ) "MACTsk",\r
+                                               "MACTsk",\r
                                                configMINIMAL_STACK_SIZE,       /* Stack allocated to the task (defined in words, not bytes). */\r
                                                NULL,                                           /* The task parameter is not used. */\r
                                                configMAX_PRIORITIES - 1,       /* The priority assigned to the task. */\r
@@ -141,9 +141,9 @@ extern uint8_t ucMACAddress[ 6 ];
 }\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
@@ -236,7 +236,7 @@ xIPStackEvent_t xRxEvent = { eEthernetRxEvent, NULL };
                {\r
                        /* The buffer filled by the DMA is going to be passed into the IP\r
                        stack.  Allocate another buffer for the DMA descriptor. */\r
-                       pxNetworkBuffer = pxNetworkBufferGet( ipTOTAL_ETHERNET_FRAME_SIZE, ( portTickType ) 0 );\r
+                       pxNetworkBuffer = pxNetworkBufferGet( ipTOTAL_ETHERNET_FRAME_SIZE, ( TickType_t ) 0 );\r
 \r
                        if( pxNetworkBuffer != NULL )\r
                        {\r
@@ -273,7 +273,7 @@ xIPStackEvent_t xRxEvent = { eEthernetRxEvent, NULL };
                                        /* 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