From e8dd5f56c356d5f342318c3934fc610ad6135262 Mon Sep 17 00:00:00 2001 From: Jonathan Gjertsen Date: Tue, 5 Apr 2022 21:24:02 +0200 Subject: [PATCH] Make conversions from uint8 to eIPTCPState_t explicit Prevents this warning from the TI CCS compiler: warning #190-D: enumerated type mixed with another type Regardless of this compiler warning it seems like a good idea to signal that this conversion is OK and expected. This is already being done when doing the opposite conversion. --- FreeRTOS_Sockets.c | 4 ++-- FreeRTOS_TCP_IP.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FreeRTOS_Sockets.c b/FreeRTOS_Sockets.c index b8269ca97e..7e6de20238 100644 --- a/FreeRTOS_Sockets.c +++ b/FreeRTOS_Sockets.c @@ -2921,7 +2921,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket ) static BaseType_t bMayConnect( FreeRTOS_Socket_t const * pxSocket ) { BaseType_t xResult; - eIPTCPState_t eState = pxSocket->u.xTCP.ucTCPState; + eIPTCPState_t eState = ( eIPTCPState_t ) pxSocket->u.xTCP.ucTCPState; switch( eState ) { @@ -3318,7 +3318,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket ) while( xByteCount == 0 ) { - eIPTCPState_t eState = pxSocket->u.xTCP.ucTCPState; + eIPTCPState_t eState = ( eIPTCPState_t ) pxSocket->u.xTCP.ucTCPState; switch( eState ) { diff --git a/FreeRTOS_TCP_IP.c b/FreeRTOS_TCP_IP.c index 6d5f516eb3..881040622a 100644 --- a/FreeRTOS_TCP_IP.c +++ b/FreeRTOS_TCP_IP.c @@ -397,7 +397,7 @@ static BaseType_t prvTCPSocketIsActive( uint8_t ucStatus ) { BaseType_t xResult; - eIPTCPState_t eStatus = ucStatus; + eIPTCPState_t eStatus = ( eIPTCPState_t ) ucStatus; switch( eStatus ) { @@ -458,7 +458,7 @@ static BaseType_t prvTCPStatusAgeCheck( FreeRTOS_Socket_t * pxSocket ) { BaseType_t xResult; - eIPTCPState_t eState = pxSocket->u.xTCP.ucTCPState; + eIPTCPState_t eState = ( eIPTCPState_t ) pxSocket->u.xTCP.ucTCPState; switch( eState ) { @@ -3357,7 +3357,7 @@ } } - eState = pxSocket->u.xTCP.ucTCPState; + eState = ( eIPTCPState_t ) pxSocket->u.xTCP.ucTCPState; switch( eState ) {