From 652ae9a8bd66c2025f039ec0bbff82e42c4ab8ab Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 30 Jan 2024 09:56:31 -0500 Subject: [PATCH 1/9] Check FreeRTOSConfig and validate more ipconfig --- source/include/FreeRTOSIPConfigDefaults.h | 79 ++++++++++++++++++----- 1 file changed, 62 insertions(+), 17 deletions(-) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index 86fe258722..5fb2d717ac 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -136,19 +136,47 @@ /*---------------------------------------------------------------------------*/ +/*===========================================================================*/ +/* MACROS */ +/*===========================================================================*/ +/*---------------------------------------------------------------------------*/ +/*===========================================================================*/ +/*---------------------------------------------------------------------------*/ +/*===========================================================================*/ +/* FreeRTOSConfig CHECKS */ +/*===========================================================================*/ + +/*---------------------------------------------------------------------------*/ + /* * pdFREERTOS_ERRNO_EAFNOSUPPORT * * Address family not supported by protocol. * - * Note: Now included in FreeRTOS-Kernel/projdefs.h, so this serves as a - * temporary kernel version check. To be removed in a future version. + * Note: pdFREERTOS_ERRNO_EAFNOSUPPORT is now included in + * FreeRTOS-Kernel/projdefs.h, defined here for backwards compatibility. */ +#ifndef pdFREERTOS_ERRNO_EAFNOSUPPORT + #define pdFREERTOS_ERRNO_EAFNOSUPPORT 97 +#endif + +#if ( INCLUDE_vTaskDelay == 0 ) + #error INCLUDE_vTaskDelay must be set to 1 +#endif + +#if ( INCLUDE_xTaskGetCurrentTaskHandle == 0 ) + #error INCLUDE_xTaskGetCurrentTaskHandle must be set to 1 +#endif + +#if ( configSUPPORT_DYNAMIC_ALLOCATION == 0 ) + #error configSUPPORT_DYNAMIC_ALLOCATION must be set to 1 +#endif + /*---------------------------------------------------------------------------*/ /*===========================================================================*/ -/* MACROS */ +/* FreeRTOSConfig CHECKS */ /*===========================================================================*/ /*---------------------------------------------------------------------------*/ /*===========================================================================*/ @@ -315,9 +343,7 @@ #error ipconfigRA_SEARCH_TIME_OUT_MSEC must be at least 0 #endif -#if ( ipconfigRA_SEARCH_TIME_OUT_MSEC > SIZE_MAX ) - #error ipconfigRA_SEARCH_TIME_OUT_MSEC must be at most portMAX_DELAY * portTICK_PERIOD_MS -#endif +STATIC_ASSERT( ipconfigRA_SEARCH_TIME_OUT_MSEC <= ( portMAX_DELAY * portTICK_PERIOD_MS ) ); /*---------------------------------------------------------------------------*/ @@ -365,9 +391,7 @@ #error ipconfigRA_IP_TEST_TIME_OUT_MSEC must be at least 0 #endif -#if ( ipconfigRA_IP_TEST_TIME_OUT_MSEC > SIZE_MAX ) - #error ipconfigRA_IP_TEST_TIME_OUT_MSEC must be at most portMAX_DELAY * portTICK_PERIOD_MS -#endif +STATIC_ASSERT( ipconfigRA_IP_TEST_TIME_OUT_MSEC <= ( portMAX_DELAY * portTICK_PERIOD_MS ) ); /*---------------------------------------------------------------------------*/ @@ -463,6 +487,10 @@ #define ipconfigMAX_IP_TASK_SLEEP_TIME pdMS_TO_TICKS( 10000 ) #endif +STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME >= 0 ); + +STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /*===========================================================================*/ @@ -981,6 +1009,8 @@ #define ipconfigPHY_LS_HIGH_CHECK_TIME_MS ( 15000 ) #endif +STATIC_ASSERT( pdMS_TO_TICKS( ipconfigPHY_LS_HIGH_CHECK_TIME_MS ) <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /* @@ -996,6 +1026,8 @@ #define ipconfigPHY_LS_LOW_CHECK_TIME_MS ( 1000 ) #endif +STATIC_ASSERT( pdMS_TO_TICKS( ipconfigPHY_LS_LOW_CHECK_TIME_MS ) <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /* @@ -1015,7 +1047,7 @@ * * Type: size_t * Unit: count of ports - * Minimum: 0 + * Minimum: 1 * Maximum: 32 * * There can be at most 32 PHY ports, but in most cases there are 4 or less. @@ -1025,6 +1057,14 @@ #define ipconfigPHY_MAX_PORTS ( 4 ) #endif +#if ( ipconfigPHY_MAX_PORTS < 1 ) + #error ipconfigPHY_MAX_PORTS must be at least 1 +#endif + +#if ( ipconfigPHY_MAX_PORTS > 32 ) + #error ipconfigPHY_MAX_PORTS must be at most 32 +#endif + /*---------------------------------------------------------------------------*/ /*===========================================================================*/ @@ -1136,6 +1176,8 @@ #define ipconfigIP_TASK_STACK_SIZE_WORDS configMINIMAL_STACK_SIZE #endif +STATIC_ASSERT( ipconfigIP_TASK_STACK_SIZE_WORDS >= configMINIMAL_STACK_SIZE ); + /*---------------------------------------------------------------------------*/ /* @@ -1310,9 +1352,7 @@ #error ipconfigTCP_HANG_PROTECTION_TIME must be at least 0 #endif -#if ( ipconfigTCP_HANG_PROTECTION_TIME > SIZE_MAX ) - #error ipconfigTCP_HANG_PROTECTION_TIME must be at most portMAX_DELAY / configTICK_RATE_HZ -#endif +STATIC_ASSERT( ipconfigTCP_HANG_PROTECTION_TIME <= ( portMAX_DELAY / configTICK_RATE_HZ ) ); /*---------------------------------------------------------------------------*/ @@ -1379,9 +1419,7 @@ #error ipconfigTCP_KEEP_ALIVE_INTERVAL must be at least 0 #endif -#if ( ipconfigTCP_KEEP_ALIVE_INTERVAL > SIZE_MAX ) - #error ipconfigTCP_KEEP_ALIVE_INTERVAL must be at most portMAX_DELAY / configTICK_RATE_HZ -#endif +STATIC_ASSERT( ipconfigTCP_KEEP_ALIVE_INTERVAL <= ( portMAX_DELAY / configTICK_RATE_HZ ) ); /*---------------------------------------------------------------------------*/ @@ -1713,6 +1751,8 @@ #define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 20 ) #endif +STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /* @@ -2156,7 +2196,6 @@ #endif #if ( ( ipconfigUSE_DHCP != ipconfigDISABLE ) && ( ipconfigNETWORK_MTU < 586 ) ) - #error ipconfigNETWORK_MTU needs to be at least 586 to use DHCP #endif @@ -2304,6 +2343,8 @@ #endif #endif +STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /*===========================================================================*/ @@ -2500,6 +2541,8 @@ #define ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS pdMS_TO_TICKS( 5000 ) #endif +STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /* @@ -2521,6 +2564,8 @@ #define ipconfigDNS_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 500 ) #endif +STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /* From b2be6a84e1262ee46505b2e9156b2a434fbd2cc9 Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 30 Jan 2024 10:22:04 -0500 Subject: [PATCH 2/9] Add a few more checks --- source/include/FreeRTOSIPConfigDefaults.h | 32 +++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index 5fb2d717ac..4c8671fe6e 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -1009,6 +1009,10 @@ STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME <= portMAX_DELAY ); #define ipconfigPHY_LS_HIGH_CHECK_TIME_MS ( 15000 ) #endif +#if ( ipconfigPHY_LS_HIGH_CHECK_TIME_MS < 0 ) + #error ipconfigPHY_LS_HIGH_CHECK_TIME_MS must be at least 0 +#endif + STATIC_ASSERT( pdMS_TO_TICKS( ipconfigPHY_LS_HIGH_CHECK_TIME_MS ) <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -1026,6 +1030,10 @@ STATIC_ASSERT( pdMS_TO_TICKS( ipconfigPHY_LS_HIGH_CHECK_TIME_MS ) <= portMAX_DEL #define ipconfigPHY_LS_LOW_CHECK_TIME_MS ( 1000 ) #endif +#if ( ipconfigPHY_LS_LOW_CHECK_TIME_MS < 0 ) + #error ipconfigPHY_LS_LOW_CHECK_TIME_MS must be at least 0 +#endif + STATIC_ASSERT( pdMS_TO_TICKS( ipconfigPHY_LS_LOW_CHECK_TIME_MS ) <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -1178,6 +1186,8 @@ STATIC_ASSERT( pdMS_TO_TICKS( ipconfigPHY_LS_LOW_CHECK_TIME_MS ) <= portMAX_DELA STATIC_ASSERT( ipconfigIP_TASK_STACK_SIZE_WORDS >= configMINIMAL_STACK_SIZE ); +STATIC_ASSERT( ipconfigIP_TASK_STACK_SIZE_WORDS <= SIZE_MAX ); + /*---------------------------------------------------------------------------*/ /* @@ -1751,6 +1761,8 @@ STATIC_ASSERT( ipconfigTCP_KEEP_ALIVE_INTERVAL <= ( portMAX_DELAY / configTICK_R #define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 20 ) #endif +STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0 ); + STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -1890,6 +1902,12 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); #error Invalid ipconfigSELECT_USES_NOTIFY configuration #endif +#if ipconfigIS_ENABLED( ipconfigSELECT_USES_NOTIFY ) + #if ( configUSE_TASK_NOTIFICATIONS == 0 ) + #error configUSE_TASK_NOTIFICATIONS must be 1 if ipconfigSELECT_USES_NOTIFY is enabled + #endif +#endif + /*---------------------------------------------------------------------------*/ /* @@ -1934,6 +1952,10 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME portMAX_DELAY #endif +STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0 ); + +STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /* @@ -1960,6 +1982,10 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME portMAX_DELAY #endif +STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0 ); + +STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY ); + /*---------------------------------------------------------------------------*/ /* @@ -2343,6 +2369,8 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); #endif #endif +STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0 ); + STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -2541,6 +2569,8 @@ STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); #define ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS pdMS_TO_TICKS( 5000 ) #endif +STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0 ); + STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -2564,6 +2594,8 @@ STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigDNS_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 500 ) #endif +STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0 ); + STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ From ce24cf40f2960f9b2f296acf1e541a2acabf1606 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 30 Jan 2024 19:04:11 +0000 Subject: [PATCH 3/9] Uncrustify: triggered by comment. --- source/include/FreeRTOSIPConfigDefaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index 4c8671fe6e..cd3defd287 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -158,7 +158,7 @@ */ #ifndef pdFREERTOS_ERRNO_EAFNOSUPPORT - #define pdFREERTOS_ERRNO_EAFNOSUPPORT 97 + #define pdFREERTOS_ERRNO_EAFNOSUPPORT 97 #endif #if ( INCLUDE_vTaskDelay == 0 ) From e891797a840e716382389b935a955d34cbfd69b4 Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 30 Jan 2024 14:08:35 -0500 Subject: [PATCH 4/9] check for counting semaphores --- source/include/FreeRTOSIPConfigDefaults.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index cd3defd287..c532b62902 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -173,6 +173,10 @@ #error configSUPPORT_DYNAMIC_ALLOCATION must be set to 1 #endif +#if ( configUSE_COUNTING_SEMAPHORES == 0 ) + #error configUSE_COUNTING_SEMAPHORES must be set to 1 +#endif + /*---------------------------------------------------------------------------*/ /*===========================================================================*/ From 78779c4e8d9d834c11da213d64dd1b8257cd5681 Mon Sep 17 00:00:00 2001 From: Holden Date: Mon, 5 Feb 2024 23:56:18 -0500 Subject: [PATCH 5/9] resolve pedantic error with static assert --- source/include/FreeRTOSIPConfigDefaults.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index 9a6ca552c2..76b5986dc4 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -80,10 +80,10 @@ #define ASSERT_CONCAT( a, b ) ASSERT_CONCAT_( a, b ) #ifdef __COUNTER__ #define STATIC_ASSERT( e ) \ - ; enum { ASSERT_CONCAT( static_assert_, __COUNTER__ ) = ( 1 / ( int ) ( !!( e ) ) ) } + enum { ASSERT_CONCAT( static_assert_, __COUNTER__ ) = ( 1 / ( int ) ( !!( e ) ) ) } #else #define STATIC_ASSERT( e ) \ - ; enum { ASSERT_CONCAT( assert_line_, __LINE__ ) = ( 1 / ( int ) ( !!( e ) ) ) } + enum { ASSERT_CONCAT( assert_line_, __LINE__ ) = ( 1 / ( int ) ( !!( e ) ) ) } #endif #endif /* ifdef static_assert */ From f6500501b9fd991d9080f10b81920e01eaf26e77 Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 6 Feb 2024 00:04:52 -0500 Subject: [PATCH 6/9] resolve type limit error --- source/include/FreeRTOSIPConfigDefaults.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index 76b5986dc4..938cb345f0 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -36,6 +36,7 @@ #ifndef FREERTOS_IP_CONFIG_DEFAULTS_H #define FREERTOS_IP_CONFIG_DEFAULTS_H +#include #ifndef FREERTOS_CONFIG_H #error FreeRTOSConfig.h has not been included yet #endif @@ -491,7 +492,7 @@ STATIC_ASSERT( ipconfigRA_IP_TEST_TIME_OUT_MSEC <= ( portMAX_DELAY * portTICK_PE #define ipconfigMAX_IP_TASK_SLEEP_TIME pdMS_TO_TICKS( 10000 ) #endif -STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME >= 0 ); +STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME >= 0L ); STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME <= portMAX_DELAY ); @@ -1765,7 +1766,7 @@ STATIC_ASSERT( ipconfigTCP_KEEP_ALIVE_INTERVAL <= ( portMAX_DELAY / configTICK_R #define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 20 ) #endif -STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0 ); +STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0L ); STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); @@ -1956,7 +1957,7 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME portMAX_DELAY #endif -STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0 ); +STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0L ); STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY ); @@ -1986,7 +1987,7 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME portMAX_DELAY #endif -STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0 ); +STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0L ); STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY ); @@ -2377,7 +2378,7 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY ); #endif #endif -STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0 ); +STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0L ); STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); @@ -2577,7 +2578,7 @@ STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); #define ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS pdMS_TO_TICKS( 5000 ) #endif -STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0 ); +STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0L ); STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); @@ -2602,7 +2603,7 @@ STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigDNS_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 500 ) #endif -STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0 ); +STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0L ); STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); From 59097af90f6ca5f514e97ba19af9b875063d2e9c Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 6 Feb 2024 00:06:22 -0500 Subject: [PATCH 7/9] remove extraneous line --- source/include/FreeRTOSIPConfigDefaults.h | 1 - 1 file changed, 1 deletion(-) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index 938cb345f0..ba540b0b4a 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -36,7 +36,6 @@ #ifndef FREERTOS_IP_CONFIG_DEFAULTS_H #define FREERTOS_IP_CONFIG_DEFAULTS_H -#include #ifndef FREERTOS_CONFIG_H #error FreeRTOSConfig.h has not been included yet #endif From a444ee6a9eac7d8eaab907a8089ae967a3129260 Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 6 Feb 2024 01:11:48 -0500 Subject: [PATCH 8/9] fix type error --- source/include/FreeRTOSIPConfigDefaults.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index ba540b0b4a..a043b9a2a7 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -491,7 +491,7 @@ STATIC_ASSERT( ipconfigRA_IP_TEST_TIME_OUT_MSEC <= ( portMAX_DELAY * portTICK_PE #define ipconfigMAX_IP_TASK_SLEEP_TIME pdMS_TO_TICKS( 10000 ) #endif -STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME >= 0L ); +STATIC_ASSERT( ( int64_t ) ipconfigMAX_IP_TASK_SLEEP_TIME >= 0 ); STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME <= portMAX_DELAY ); @@ -1765,7 +1765,7 @@ STATIC_ASSERT( ipconfigTCP_KEEP_ALIVE_INTERVAL <= ( portMAX_DELAY / configTICK_R #define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 20 ) #endif -STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0L ); +STATIC_ASSERT( ( int64_t ) ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0 ); STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); @@ -1956,7 +1956,7 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME portMAX_DELAY #endif -STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0L ); +STATIC_ASSERT( ( int64_t ) ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0 ); STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY ); @@ -1986,7 +1986,7 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME portMAX_DELAY #endif -STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0L ); +STATIC_ASSERT( ( int64_t ) ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0 ); STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY ); @@ -2377,7 +2377,7 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY ); #endif #endif -STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0L ); +STATIC_ASSERT( ( int64_t ) ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0 ); STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); @@ -2577,7 +2577,7 @@ STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); #define ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS pdMS_TO_TICKS( 5000 ) #endif -STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0L ); +STATIC_ASSERT( ( int64_t ) ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0 ); STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); @@ -2602,7 +2602,7 @@ STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigDNS_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 500 ) #endif -STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0L ); +STATIC_ASSERT( ( int64_t ) ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0 ); STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); From 9da19d57f7d0b659365378b7d48861ea88fdb404 Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 6 Feb 2024 01:42:03 -0500 Subject: [PATCH 9/9] remove 0 check due to portMAX_DELAY sign extending --- source/include/FreeRTOSIPConfigDefaults.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index a043b9a2a7..3dfddd0bc8 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -491,8 +491,6 @@ STATIC_ASSERT( ipconfigRA_IP_TEST_TIME_OUT_MSEC <= ( portMAX_DELAY * portTICK_PE #define ipconfigMAX_IP_TASK_SLEEP_TIME pdMS_TO_TICKS( 10000 ) #endif -STATIC_ASSERT( ( int64_t ) ipconfigMAX_IP_TASK_SLEEP_TIME >= 0 ); - STATIC_ASSERT( ipconfigMAX_IP_TASK_SLEEP_TIME <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -1765,8 +1763,6 @@ STATIC_ASSERT( ipconfigTCP_KEEP_ALIVE_INTERVAL <= ( portMAX_DELAY / configTICK_R #define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 20 ) #endif -STATIC_ASSERT( ( int64_t ) ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS >= 0 ); - STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -1956,8 +1952,6 @@ STATIC_ASSERT( ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME portMAX_DELAY #endif -STATIC_ASSERT( ( int64_t ) ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME >= 0 ); - STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -1986,8 +1980,6 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME <= portMAX_DELAY ); #define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME portMAX_DELAY #endif -STATIC_ASSERT( ( int64_t ) ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME >= 0 ); - STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -2377,8 +2369,6 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY ); #endif #endif -STATIC_ASSERT( ( int64_t ) ipconfigMAXIMUM_DISCOVER_TX_PERIOD >= 0 ); - STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -2577,8 +2567,6 @@ STATIC_ASSERT( ipconfigMAXIMUM_DISCOVER_TX_PERIOD <= portMAX_DELAY ); #define ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS pdMS_TO_TICKS( 5000 ) #endif -STATIC_ASSERT( ( int64_t ) ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS >= 0 ); - STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/ @@ -2602,8 +2590,6 @@ STATIC_ASSERT( ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS <= portMAX_DELAY ); #define ipconfigDNS_SEND_BLOCK_TIME_TICKS pdMS_TO_TICKS( 500 ) #endif -STATIC_ASSERT( ( int64_t ) ipconfigDNS_SEND_BLOCK_TIME_TICKS >= 0 ); - STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY ); /*---------------------------------------------------------------------------*/