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

[freertos] / FreeRTOS-Plus / Source / FreeRTOS-Plus-UDP / FreeRTOS_DHCP.c

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c
index 8c3d78fcf6854e844cf6d81eb874f4b683e02c78..eb1dbeaf628dbcf8c7d26ce4e2e89632c11a5c5d 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c
@@ -185,7 +185,7 @@ static void prvSendDHCPDiscover( xMACAddress_t *pxMACAddress );
 /*\r
  * Interpret message received on the DHCP socket.\r
  */\r
-static portBASE_TYPE prvProcessDHCPReplies( uint8_t ucExpectedMessageType, xMACAddress_t *pxMACAddress, xNetworkAddressingParameters_t *pxNetworkAddressing );\r
+static BaseType_t prvProcessDHCPReplies( uint8_t ucExpectedMessageType, xMACAddress_t *pxMACAddress, xNetworkAddressingParameters_t *pxNetworkAddressing );\r
 \r
 /*\r
  * Generate a DHCP request packet, and send it on the DHCP socket.\r
@@ -221,14 +221,14 @@ static xSocket_t xDHCPSocket = NULL;
 static uint32_t ulTransactionId = 0UL, ulOfferedIPAddress = 0UL, ulDHCPServerAddress = 0UL, ulLeaseTime = 0;\r
 \r
 /* Hold information on the current timer state. */\r
-static portTickType xDHCPTxTime = 0x00, xDHCPTxPeriod = 0x00;\r
+static TickType_t xDHCPTxTime = 0x00, xDHCPTxPeriod = 0x00;\r
 \r
 /* Maintains the DHCP state machine state. */\r
 static eDHCPState_t eDHCPState = eWaitingSendFirstDiscover;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
-void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t *pulIPAddress, xNetworkAddressingParameters_t *pxNetworkAddressing )\r
+void vDHCPProcess( BaseType_t xReset, xMACAddress_t *pxMACAddress, uint32_t *pulIPAddress, xNetworkAddressingParameters_t *pxNetworkAddressing )\r
 {\r
        if( xReset != pdFALSE )\r
        {\r
@@ -288,7 +288,7 @@ void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t *
                                                }\r
                                                taskEXIT_CRITICAL();\r
                                                eDHCPState = eNotUsingLeasedAddress;\r
-                                               xTimerStop( xDHCPTimer, ( portTickType ) 0 );\r
+                                               xTimerStop( xDHCPTimer, ( TickType_t ) 0 );\r
 \r
                                                #if ipconfigUSE_NETWORK_EVENT_HOOK == 1\r
                                                {\r
@@ -395,7 +395,7 @@ void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t *
                        break;\r
 \r
                case eNotUsingLeasedAddress:\r
-                       xTimerStop( xDHCPTimer, ( portTickType ) 0 );\r
+                       xTimerStop( xDHCPTimer, ( TickType_t ) 0 );\r
                        break;\r
        }\r
 }\r
@@ -404,8 +404,8 @@ void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t *
 static void prvCreateDHCPSocket( void )\r
 {\r
 struct freertos_sockaddr xAddress;\r
-portBASE_TYPE xReturn;\r
-portTickType xTimeoutTime = 0;\r
+BaseType_t xReturn;\r
+TickType_t xTimeoutTime = 0;\r
 \r
        /* Create the socket, if it has not already been created. */\r
        if( xDHCPSocket == NULL )\r
@@ -415,8 +415,8 @@ portTickType xTimeoutTime = 0;
 \r
                /* Ensure the Rx and Tx timeouts are zero as the DHCP executes in the\r
                context of the IP task. */\r
-               FreeRTOS_setsockopt( xDHCPSocket, 0, FREERTOS_SO_RCVTIMEO, ( void * ) &xTimeoutTime, sizeof( portTickType ) );\r
-               FreeRTOS_setsockopt( xDHCPSocket, 0, FREERTOS_SO_SNDTIMEO, ( void * ) &xTimeoutTime, sizeof( portTickType ) );\r
+               FreeRTOS_setsockopt( xDHCPSocket, 0, FREERTOS_SO_RCVTIMEO, ( void * ) &xTimeoutTime, sizeof( TickType_t ) );\r
+               FreeRTOS_setsockopt( xDHCPSocket, 0, FREERTOS_SO_SNDTIMEO, ( void * ) &xTimeoutTime, sizeof( TickType_t ) );\r
 \r
                /* Bind to the standard DHCP client port. */\r
                xAddress.sin_port = dhcpCLIENT_PORT;\r
@@ -462,7 +462,7 @@ extern void vIPFunctionsTimerCallback( xTimerHandle xTimer );
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static portBASE_TYPE prvProcessDHCPReplies( uint8_t ucExpectedMessageType, xMACAddress_t *pxMACAddress, xNetworkAddressingParameters_t *pxNetworkAddressing )\r
+static BaseType_t prvProcessDHCPReplies( uint8_t ucExpectedMessageType, xMACAddress_t *pxMACAddress, xNetworkAddressingParameters_t *pxNetworkAddressing )\r
 {\r
 uint8_t *pucUDPPayload, *pucLastByte;\r
 struct freertos_sockaddr xClient;\r
@@ -471,7 +471,7 @@ int32_t lBytes;
 xDHCPMessage_t *pxDHCPMessage;\r
 uint8_t *pucByte, ucOptionCode, ucLength;\r
 uint32_t ulProcessed;\r
-portBASE_TYPE xReturn = pdFALSE;\r
+BaseType_t xReturn = pdFALSE;\r
 const uint32_t ulMandatoryOptions = 2; /* DHCP server address, and the correct DHCP message type must be present in the options. */\r
 \r
        lBytes = FreeRTOS_recvfrom( xDHCPSocket, ( void * ) &pucUDPPayload, 0, FREERTOS_ZERO_COPY, &xClient, &xClientLength );\r