From 31cee77a66fa83b7165c59243342b6150487c344 Mon Sep 17 00:00:00 2001 From: pete-pjb Date: Wed, 16 Nov 2022 13:52:33 +0000 Subject: [PATCH 1/2] Eliminate some warnings --- source/FreeRTOS_IP.c | 2 +- source/FreeRTOS_IP_Utils.c | 4 ++-- source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/FreeRTOS_IP.c b/source/FreeRTOS_IP.c index 9add500e51..4c6b54be6d 100644 --- a/source/FreeRTOS_IP.c +++ b/source/FreeRTOS_IP.c @@ -1563,7 +1563,7 @@ static eFrameProcessingResult_t prvAllowIPPacket( const IPPacket_t * const pxIPP if( xCount < 5 ) /* LCOV_EXCL_BR_LINE */ { FreeRTOS_printf( ( "prvAllowIPPacket: UDP packet from %xip without CRC dropped\n", - FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); + (unsigned)FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); xCount++; } } diff --git a/source/FreeRTOS_IP_Utils.c b/source/FreeRTOS_IP_Utils.c index 4919d6f744..fcacc4687d 100644 --- a/source/FreeRTOS_IP_Utils.c +++ b/source/FreeRTOS_IP_Utils.c @@ -640,7 +640,7 @@ uint16_t usGenerateProtocolChecksum( uint8_t * pucEthernetBuffer, if( xCount < 5 ) /* LCOV_EXCL_BR_LINE */ { FreeRTOS_printf( ( "usGenerateProtocolChecksum: UDP packet from %xip without CRC dropped\n", - FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); + (unsigned)FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); xCount++; } } @@ -1050,7 +1050,7 @@ uint16_t usGenerateChecksum( uint16_t usSum, else if( ( uxMinLastSize * ipMONITOR_PERCENTAGE_90 ) > ( uxMinSize * ipMONITOR_PERCENTAGE_100 ) ) { uxMinLastSize = uxMinSize; - FreeRTOS_printf( ( "Heap: current %lu lowest %lu\n", xPortGetFreeHeapSize(), uxMinSize ) ); + FreeRTOS_printf( ( "Heap: current %u lowest %u\n", xPortGetFreeHeapSize(), uxMinSize ) ); } else { diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c b/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c index a023e6c867..21c9a2e1e8 100644 --- a/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c +++ b/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c @@ -178,7 +178,7 @@ static int detect_phy( XEmacPs * xemacpsp ) { XEmacPs_PhyRead( xemacpsp, phy_addr, IEEE_PHYSID2_OFFSET, &id_upper ); id = ( ( ( uint32_t ) id_upper ) << 16 ) | ( id_lower & 0xFFF0 ); - FreeRTOS_printf( ( "XEmacPs detect_phy: %04lX at address %d.\n", id, phy_addr ) ); + FreeRTOS_printf( ( "XEmacPs detect_phy: %04lX at address %u.\n", id, (unsigned)phy_addr ) ); phy_detected = phy_addr; return phy_addr; } From 21dc4df8df47520d7614c79dae5fe67120303318 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 16 Nov 2022 16:57:50 +0000 Subject: [PATCH 2/2] Uncrustify: triggered by comment. --- source/FreeRTOS_IP.c | 2 +- source/FreeRTOS_IP_Utils.c | 2 +- source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/FreeRTOS_IP.c b/source/FreeRTOS_IP.c index 4c6b54be6d..b2b05c5655 100644 --- a/source/FreeRTOS_IP.c +++ b/source/FreeRTOS_IP.c @@ -1563,7 +1563,7 @@ static eFrameProcessingResult_t prvAllowIPPacket( const IPPacket_t * const pxIPP if( xCount < 5 ) /* LCOV_EXCL_BR_LINE */ { FreeRTOS_printf( ( "prvAllowIPPacket: UDP packet from %xip without CRC dropped\n", - (unsigned)FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); + ( unsigned ) FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); xCount++; } } diff --git a/source/FreeRTOS_IP_Utils.c b/source/FreeRTOS_IP_Utils.c index fcacc4687d..1b521e3b2a 100644 --- a/source/FreeRTOS_IP_Utils.c +++ b/source/FreeRTOS_IP_Utils.c @@ -640,7 +640,7 @@ uint16_t usGenerateProtocolChecksum( uint8_t * pucEthernetBuffer, if( xCount < 5 ) /* LCOV_EXCL_BR_LINE */ { FreeRTOS_printf( ( "usGenerateProtocolChecksum: UDP packet from %xip without CRC dropped\n", - (unsigned)FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); + ( unsigned ) FreeRTOS_ntohl( pxIPPacket->xIPHeader.ulSourceIPAddress ) ) ); xCount++; } } diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c b/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c index 21c9a2e1e8..1718c4ed6c 100644 --- a/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c +++ b/source/portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c @@ -178,7 +178,7 @@ static int detect_phy( XEmacPs * xemacpsp ) { XEmacPs_PhyRead( xemacpsp, phy_addr, IEEE_PHYSID2_OFFSET, &id_upper ); id = ( ( ( uint32_t ) id_upper ) << 16 ) | ( id_lower & 0xFFF0 ); - FreeRTOS_printf( ( "XEmacPs detect_phy: %04lX at address %u.\n", id, (unsigned)phy_addr ) ); + FreeRTOS_printf( ( "XEmacPs detect_phy: %04lX at address %u.\n", id, ( unsigned ) phy_addr ) ); phy_detected = phy_addr; return phy_addr; }