diff --git a/source/include/FreeRTOS_ARP.h b/source/include/FreeRTOS_ARP.h index 308283b05..21357b799 100644 --- a/source/include/FreeRTOS_ARP.h +++ b/source/include/FreeRTOS_ARP.h @@ -28,10 +28,10 @@ #ifndef FREERTOS_ARP_H #define FREERTOS_ARP_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" -/* Core FreeRTOS+TCP Includes. */ #include "FreeRTOS_IP.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_BitConfig.h b/source/include/FreeRTOS_BitConfig.h index 5cb367d9c..952bfb714 100644 --- a/source/include/FreeRTOS_BitConfig.h +++ b/source/include/FreeRTOS_BitConfig.h @@ -35,9 +35,6 @@ #ifndef FREERTOS_BITCONFIG_H #define FREERTOS_BITCONFIG_H -/* Global Includes & Definitions. */ - #include "FreeRTOS_IP_Common.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/source/include/FreeRTOS_DHCP.h b/source/include/FreeRTOS_DHCP.h index 13886cff4..f5b6433c1 100644 --- a/source/include/FreeRTOS_DHCP.h +++ b/source/include/FreeRTOS_DHCP.h @@ -28,10 +28,11 @@ #ifndef FREERTOS_DHCP_H #define FREERTOS_DHCP_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +#include "FreeRTOS.h" + +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" -/* Core FreeRTOS+TCP Includes. */ #include "FreeRTOS_Sockets.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_DHCPv6.h b/source/include/FreeRTOS_DHCPv6.h index c10f6e27e..0e2792c86 100644 --- a/source/include/FreeRTOS_DHCPv6.h +++ b/source/include/FreeRTOS_DHCPv6.h @@ -26,11 +26,9 @@ #ifndef FREERTOS_DHCPV6_H #define FREERTOS_DHCPV6_H -/* Global Includes & Definitions. */ - #include "FreeRTOS_IP_Common.h" - -/* Optional FreeRTOS+TCP Includes. */ +/* Application level configuration options. */ #include "FreeRTOS_DHCP.h" + #include "FreeRTOSIPConfig.h" #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_DNS.h b/source/include/FreeRTOS_DNS.h index 73a3f01c8..04daeb232 100644 --- a/source/include/FreeRTOS_DNS.h +++ b/source/include/FreeRTOS_DNS.h @@ -28,13 +28,12 @@ #ifndef FREERTOS_DNS_H #define FREERTOS_DNS_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +#include "FreeRTOS.h" -/* Optional FreeRTOS+TCP Includes. */ -#include "FreeRTOS_DNS_Cache.h" -#include "FreeRTOS_DNS_Callback.h" +/* Application level configuration options. */ #include "FreeRTOS_DNS_Globals.h" +#include "FreeRTOS_DNS_Callback.h" +#include "FreeRTOS_DNS_Cache.h" /* *INDENT-OFF* */ #ifdef __cplusplus diff --git a/source/include/FreeRTOS_DNS_Cache.h b/source/include/FreeRTOS_DNS_Cache.h index b95ef28f0..2dd6b19a3 100644 --- a/source/include/FreeRTOS_DNS_Cache.h +++ b/source/include/FreeRTOS_DNS_Cache.h @@ -28,12 +28,14 @@ #ifndef FREERTOS_DNS_CACHE_H #define FREERTOS_DNS_CACHE_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +/* FreeRTOS includes. */ +#include "FreeRTOS.h" -/* Optional FreeRTOS+TCP Includes. */ #include "FreeRTOS_DNS_Globals.h" +/* Standard includes. */ +#include + #if ( ( ipconfigUSE_DNS_CACHE == 1 ) && ( ipconfigUSE_DNS != 0 ) ) /** diff --git a/source/include/FreeRTOS_DNS_Callback.h b/source/include/FreeRTOS_DNS_Callback.h index d67f5360e..81b40960c 100644 --- a/source/include/FreeRTOS_DNS_Callback.h +++ b/source/include/FreeRTOS_DNS_Callback.h @@ -29,15 +29,17 @@ #ifndef FREERTOS_DNS_CALLBACK_H #define FREERTOS_DNS_CALLBACK_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +/* FreeRTOS includes. */ +#include "FreeRTOS.h" -/* Core FreeRTOS+TCP Includes. */ +/* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" -/* Optional FreeRTOS+TCP Includes. */ #include "FreeRTOS_DNS_Globals.h" +/* Standard includes. */ +#include + /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_DNS_Globals.h b/source/include/FreeRTOS_DNS_Globals.h index 73974cd59..d60c3a8e8 100644 --- a/source/include/FreeRTOS_DNS_Globals.h +++ b/source/include/FreeRTOS_DNS_Globals.h @@ -28,10 +28,11 @@ #ifndef FREERTOS_DNS_GLOBALS_H #define FREERTOS_DNS_GLOBALS_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +#include "FreeRTOS.h" + +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" -/* Core FreeRTOS+TCP Includes. */ #include "FreeRTOS_Sockets.h" #define dnsPARSE_ERROR 0UL diff --git a/source/include/FreeRTOS_DNS_Networking.h b/source/include/FreeRTOS_DNS_Networking.h index 0061806c6..7a2ede391 100644 --- a/source/include/FreeRTOS_DNS_Networking.h +++ b/source/include/FreeRTOS_DNS_Networking.h @@ -27,14 +27,8 @@ #ifndef FREERTOS_DNS_NETWORKING_H #define FREERTOS_DNS_NETWORKING_H -/* Global Includes & Definitions */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ #include "FreeRTOS_IP.h" #include "FreeRTOS_Sockets.h" - -/* Optional FreeRTOS+TCP Includes. */ #include "FreeRTOS_DNS_Globals.h" #if ( ipconfigUSE_DNS != 0 ) diff --git a/source/include/FreeRTOS_DNS_Parser.h b/source/include/FreeRTOS_DNS_Parser.h index 477b70bc7..e45e61924 100644 --- a/source/include/FreeRTOS_DNS_Parser.h +++ b/source/include/FreeRTOS_DNS_Parser.h @@ -28,15 +28,17 @@ #ifndef FREERTOS_DNS_PARSER_H #define FREERTOS_DNS_PARSER_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +/* FreeRTOS includes. */ +#include "FreeRTOS.h" -/* Core FreeRTOS+TCP Includes. */ +/* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" -/* Optional FreeRTOS+TCP Includes. */ #include "FreeRTOS_DNS_Globals.h" +/* Standard includes. */ +#include + /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_ICMP.h b/source/include/FreeRTOS_ICMP.h index 275b0af12..45eaf7963 100644 --- a/source/include/FreeRTOS_ICMP.h +++ b/source/include/FreeRTOS_ICMP.h @@ -33,10 +33,7 @@ #ifndef FREERTOS_ICMP_H #define FREERTOS_ICMP_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ +/* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" #include "FreeRTOS_IP_Private.h" diff --git a/source/include/FreeRTOS_IP.h b/source/include/FreeRTOS_IP.h index 36750e3bc..766c18450 100644 --- a/source/include/FreeRTOS_IP.h +++ b/source/include/FreeRTOS_IP.h @@ -28,7 +28,12 @@ #ifndef FREERTOS_IP_H #define FREERTOS_IP_H -/* Global Includes & Definitions. */ +#include "FreeRTOS.h" +#include "task.h" + +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" #include "FreeRTOS_IP_Common.h" /* *INDENT-OFF* */ @@ -480,9 +485,11 @@ extern NetworkBufferDescriptor_t * pxARPWaitingNetworkBuffer; #define vPrintResourceStats() do {} while( ipFALSE_BOOL ) /**< ipconfigHAS_PRINTF is not defined. Define vPrintResourceStats to a do-while( 0 ). */ #endif -/* Core FreeRTOS+TCP Includes. */ #include "FreeRTOS_IP_Utils.h" /*TODO can be moved after other 2 includes */ + + #include "FreeRTOS_IPv4.h" + #include "FreeRTOS_IPv6.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_IP_Common.h b/source/include/FreeRTOS_IP_Common.h index e8733f54c..e557fd07b 100644 --- a/source/include/FreeRTOS_IP_Common.h +++ b/source/include/FreeRTOS_IP_Common.h @@ -28,22 +28,6 @@ #ifndef FREERTOS_IP_COMMON_H #define FREERTOS_IP_COMMON_H -/* Standard Includes. */ -#include -#include -#include - -/* FreeRTOS Includes. */ -#include "FreeRTOS.h" -#include "task.h" -#include "queue.h" -#include "semphr.h" -#include "event_groups.h" - -/* Application Level Configuration Options. */ -#include "FreeRTOSIPConfig.h" -#include "FreeRTOSIPConfigDefaults.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_IP_Private.h b/source/include/FreeRTOS_IP_Private.h index 79ed92fcb..b594582fc 100644 --- a/source/include/FreeRTOS_IP_Private.h +++ b/source/include/FreeRTOS_IP_Private.h @@ -28,17 +28,21 @@ #ifndef FREERTOS_IP_PRIVATE_H #define FREERTOS_IP_PRIVATE_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ -#include "FreeRTOS_Routing.h" +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" #include "FreeRTOS_Sockets.h" #include "FreeRTOS_Stream_Buffer.h" +#include "FreeRTOS_Routing.h" + +#if ( ipconfigUSE_TCP == 1 ) + #include "FreeRTOS_TCP_WIN.h" + #include "FreeRTOS_TCP_IP.h" +#endif + +#include "semphr.h" -/* Optional FreeRTOS+TCP Includes. */ -#include "FreeRTOS_TCP_WIN.h" -#include "FreeRTOS_TCP_IP.h" +#include "event_groups.h" /* *INDENT-OFF* */ #ifdef __cplusplus diff --git a/source/include/FreeRTOS_IP_Timers.h b/source/include/FreeRTOS_IP_Timers.h index e57e36111..8d7a84e26 100644 --- a/source/include/FreeRTOS_IP_Timers.h +++ b/source/include/FreeRTOS_IP_Timers.h @@ -33,20 +33,26 @@ #ifndef FREERTOS_IP_TIMERS_H #define FREERTOS_IP_TIMERS_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ +/* Standard includes. */ +#include +#include +#include + +/* FreeRTOS includes. */ +#include "FreeRTOS.h" +#include "task.h" +#include "queue.h" +#include "semphr.h" + +/* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" -#include "FreeRTOS_IP_Private.h" #include "FreeRTOS_Sockets.h" +#include "FreeRTOS_IP_Private.h" +#include "FreeRTOS_ARP.h" #include "FreeRTOS_UDP_IP.h" +#include "FreeRTOS_DHCP.h" #include "NetworkInterface.h" #include "NetworkBufferManagement.h" - -/* Optional FreeRTOS+TCP Includes. */ -#include "FreeRTOS_ARP.h" -#include "FreeRTOS_DHCP.h" #include "FreeRTOS_DNS.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_IP_Utils.h b/source/include/FreeRTOS_IP_Utils.h index 7bc65ab9c..37b9bb4d3 100644 --- a/source/include/FreeRTOS_IP_Utils.h +++ b/source/include/FreeRTOS_IP_Utils.h @@ -33,21 +33,28 @@ #ifndef FREERTOS_IP_UTILS_H #define FREERTOS_IP_UTILS_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ +/* Standard includes. */ +#include +#include +#include + +/* FreeRTOS includes. */ +#include "FreeRTOS.h" +#include "task.h" +#include "queue.h" +#include "semphr.h" + +/* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" -#include "FreeRTOS_IP_Private.h" -#include "FreeRTOS_Routing.h" #include "FreeRTOS_Sockets.h" +#include "FreeRTOS_Routing.h" +#include "FreeRTOS_IP_Private.h" #include "FreeRTOS_UDP_IP.h" +#include "FreeRTOS_DHCP.h" #include "NetworkInterface.h" #include "NetworkBufferManagement.h" - -/* Optional FreeRTOS+TCP Includes. */ -#include "FreeRTOS_DHCP.h" #include "FreeRTOS_DNS.h" + #include "FreeRTOS_IPv4_Utils.h" #include "FreeRTOS_IPv6_Utils.h" diff --git a/source/include/FreeRTOS_IPv4.h b/source/include/FreeRTOS_IPv4.h index 9d4ee0263..233620d37 100644 --- a/source/include/FreeRTOS_IPv4.h +++ b/source/include/FreeRTOS_IPv4.h @@ -28,8 +28,12 @@ #ifndef FREERTOS_IPV4_H #define FREERTOS_IPV4_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +#include "FreeRTOS.h" +#include "task.h" + +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" /* *INDENT-OFF* */ #ifdef __cplusplus diff --git a/source/include/FreeRTOS_IPv4_Private.h b/source/include/FreeRTOS_IPv4_Private.h index 92f5341c5..fd1cc922c 100644 --- a/source/include/FreeRTOS_IPv4_Private.h +++ b/source/include/FreeRTOS_IPv4_Private.h @@ -28,10 +28,6 @@ #ifndef FREERTOS_IPV4_PRIVATE_H #define FREERTOS_IPV4_PRIVATE_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ #include "FreeRTOS_IP_Private.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_IPv4_Sockets.h b/source/include/FreeRTOS_IPv4_Sockets.h index 209332b8d..0d6ef3221 100644 --- a/source/include/FreeRTOS_IPv4_Sockets.h +++ b/source/include/FreeRTOS_IPv4_Sockets.h @@ -28,8 +28,11 @@ #ifndef FREERTOS_IPV4_SOCKETS_H #define FREERTOS_IPV4_SOCKETS_H -/* Global Includes & Definitions. */ - #include "FreeRTOS_IP_Common.h" +/* Standard includes. */ + #include + +/* FreeRTOS includes. */ + #include "FreeRTOS.h" #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_IPv4_Utils.h b/source/include/FreeRTOS_IPv4_Utils.h index a0058564e..0ac2f66ce 100644 --- a/source/include/FreeRTOS_IPv4_Utils.h +++ b/source/include/FreeRTOS_IPv4_Utils.h @@ -33,10 +33,14 @@ * @brief Implements the utility functions for FreeRTOS_IP.c */ -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +/* Standard includes. */ +#include +#include -/* Core FreeRTOS+TCP Includes. */ +/* FreeRTOS includes. */ +#include "FreeRTOS.h" + +/* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_IPv6.h b/source/include/FreeRTOS_IPv6.h index 1acc23c51..0706a7dac 100644 --- a/source/include/FreeRTOS_IPv6.h +++ b/source/include/FreeRTOS_IPv6.h @@ -26,11 +26,10 @@ #ifndef FREERTOS_IPV6_H #define FREERTOS_IPV6_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ +#include "FreeRTOS.h" +#include "task.h" #include "FreeRTOS_IP.h" +#include "FreeRTOS_IP_Common.h" /* *INDENT-OFF* */ #ifdef __cplusplus diff --git a/source/include/FreeRTOS_IPv6_Private.h b/source/include/FreeRTOS_IPv6_Private.h index 4a09434ac..c56c9b32b 100644 --- a/source/include/FreeRTOS_IPv6_Private.h +++ b/source/include/FreeRTOS_IPv6_Private.h @@ -28,19 +28,21 @@ #ifndef FREERTOS_IPV6_PRIVATE_H #define FREERTOS_IPV6_PRIVATE_H -/* Global Includes & Definitions */ +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" #include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ #include "FreeRTOS_Sockets.h" #include "FreeRTOS_Stream_Buffer.h" - -/* Optional FreeRTOS+TCP Includes. */ #if ( ipconfigUSE_TCP == 1 ) #include "FreeRTOS_TCP_WIN.h" #include "FreeRTOS_TCP_IP.h" #endif +#include "semphr.h" + +#include "event_groups.h" + /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_IPv6_Sockets.h b/source/include/FreeRTOS_IPv6_Sockets.h index ba51b3381..c9a931e67 100644 --- a/source/include/FreeRTOS_IPv6_Sockets.h +++ b/source/include/FreeRTOS_IPv6_Sockets.h @@ -28,7 +28,11 @@ #ifndef FREERTOS_IPV6_SOCKETS_H #define FREERTOS_IPV6_SOCKETS_H -/* Global Includes & Definitions. */ +/* Standard includes. */ + #include + +/* FreeRTOS includes. */ + #include "FreeRTOS.h" #include "FreeRTOS_IP_Common.h" #ifdef __cplusplus diff --git a/source/include/FreeRTOS_IPv6_Utils.h b/source/include/FreeRTOS_IPv6_Utils.h index 7f029ea4d..34f23e985 100644 --- a/source/include/FreeRTOS_IPv6_Utils.h +++ b/source/include/FreeRTOS_IPv6_Utils.h @@ -33,12 +33,17 @@ * @brief Implements the utility functions for FreeRTOS_IP.c */ -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +/* Standard includes. */ +#include +#include -/* Core FreeRTOS+TCP Includes. */ +/* FreeRTOS includes. */ +#include "FreeRTOS.h" + +/* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" + /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_ND.h b/source/include/FreeRTOS_ND.h index 01050bead..bdbabdec7 100644 --- a/source/include/FreeRTOS_ND.h +++ b/source/include/FreeRTOS_ND.h @@ -26,10 +26,12 @@ #ifndef FREERTOS_ND_H #define FREERTOS_ND_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" +#include "FreeRTOS.h" + +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" -/* Optional FreeRTOS+TCP Includes. */ #include "FreeRTOS_ARP.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_Routing.h b/source/include/FreeRTOS_Routing.h index eb5fcb52b..f6dbd1465 100644 --- a/source/include/FreeRTOS_Routing.h +++ b/source/include/FreeRTOS_Routing.h @@ -26,17 +26,14 @@ #ifndef FREERTOS_ROUTING_H #define FREERTOS_ROUTING_H -/* Global Includes & Definitions. */ - #include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ + #include "FreeRTOS.h" #include "FreeRTOS_IP.h" #include "FreeRTOS_Sockets.h" -/* Optional FreeRTOS+TCP Includes. */ #if ( ipconfigUSE_DHCP != 0 ) #include "FreeRTOS_DHCP.h" #endif + #if ( ipconfigUSE_IPv6 != 0 ) #include "FreeRTOS_DHCPv6.h" #endif diff --git a/source/include/FreeRTOS_Sockets.h b/source/include/FreeRTOS_Sockets.h index 924865c8e..0a93660a8 100644 --- a/source/include/FreeRTOS_Sockets.h +++ b/source/include/FreeRTOS_Sockets.h @@ -28,13 +28,40 @@ #ifndef FREERTOS_SOCKETS_H #define FREERTOS_SOCKETS_H -/* Global Includes & Definitions */ +/* Standard includes. */ + #include + +/* FreeRTOS includes. */ + #include "FreeRTOS.h" + #include "task.h" + +/* Application level configuration options. */ + #include "FreeRTOSIPConfig.h" + #include "FreeRTOSIPConfigDefaults.h" + + #ifndef FREERTOS_IP_CONFIG_H + #error FreeRTOSIPConfig.h has not been included yet + #endif + #include "FreeRTOS_IP_Common.h" +/* Event bit definitions are required by the select functions. */ + #include "event_groups.h" + #ifdef __cplusplus extern "C" { #endif + #ifndef INC_FREERTOS_H + #error FreeRTOS.h must be included before FreeRTOS_Sockets.h. + #endif + + #ifndef INC_TASK_H + #ifndef TASK_H /* For compatibility with older FreeRTOS versions. */ + #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h. + #endif + #endif + /* Assigned to an Socket_t variable when the socket is not valid, probably * because it could not be created. */ #define FREERTOS_INVALID_SOCKET ( ( Socket_t ) ~0U ) diff --git a/source/include/FreeRTOS_Stream_Buffer.h b/source/include/FreeRTOS_Stream_Buffer.h index 543a765e9..884ad044a 100644 --- a/source/include/FreeRTOS_Stream_Buffer.h +++ b/source/include/FreeRTOS_Stream_Buffer.h @@ -36,9 +36,6 @@ #ifndef FREERTOS_STREAM_BUFFER_H #define FREERTOS_STREAM_BUFFER_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_TCP_IP.h b/source/include/FreeRTOS_TCP_IP.h index 9429d2fa4..0e00c8a72 100644 --- a/source/include/FreeRTOS_TCP_IP.h +++ b/source/include/FreeRTOS_TCP_IP.h @@ -28,9 +28,6 @@ #ifndef FREERTOS_TCP_IP_H #define FREERTOS_TCP_IP_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_TCP_Reception.h b/source/include/FreeRTOS_TCP_Reception.h index 2093621b4..004b0f3c7 100644 --- a/source/include/FreeRTOS_TCP_Reception.h +++ b/source/include/FreeRTOS_TCP_Reception.h @@ -28,9 +28,6 @@ #ifndef FREERTOS_TCP_RECEPTION_H #define FREERTOS_TCP_RECEPTION_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_TCP_State_Handling.h b/source/include/FreeRTOS_TCP_State_Handling.h index 889bc8040..21208c5e2 100644 --- a/source/include/FreeRTOS_TCP_State_Handling.h +++ b/source/include/FreeRTOS_TCP_State_Handling.h @@ -28,10 +28,6 @@ #ifndef FREERTOS_TCP_STATE_HANDLING_H #define FREERTOS_TCP_STATE_HANDLING_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Optional FreeRTOS+TCP Includes. */ #include "FreeRTOS_TCP_IP.h" /* *INDENT-OFF* */ diff --git a/source/include/FreeRTOS_TCP_Transmission.h b/source/include/FreeRTOS_TCP_Transmission.h index dc8f1230b..ab1eae67b 100644 --- a/source/include/FreeRTOS_TCP_Transmission.h +++ b/source/include/FreeRTOS_TCP_Transmission.h @@ -28,9 +28,6 @@ #ifndef FREERTOS_TCP_TRANSMISSION_H #define FREERTOS_TCP_TRANSMISSION_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_TCP_Utils.h b/source/include/FreeRTOS_TCP_Utils.h index 4148fe5d3..12d2daf40 100644 --- a/source/include/FreeRTOS_TCP_Utils.h +++ b/source/include/FreeRTOS_TCP_Utils.h @@ -28,9 +28,6 @@ #ifndef FREERTOS_TCP_UTILS_H #define FREERTOS_TCP_UTILS_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_TCP_WIN.h b/source/include/FreeRTOS_TCP_WIN.h index 82a99f387..787717aa3 100644 --- a/source/include/FreeRTOS_TCP_WIN.h +++ b/source/include/FreeRTOS_TCP_WIN.h @@ -33,9 +33,6 @@ #ifndef FREERTOS_TCP_WIN_H #define FREERTOS_TCP_WIN_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { diff --git a/source/include/FreeRTOS_UDP_IP.h b/source/include/FreeRTOS_UDP_IP.h index e4d54ea22..0285aaebb 100644 --- a/source/include/FreeRTOS_UDP_IP.h +++ b/source/include/FreeRTOS_UDP_IP.h @@ -28,10 +28,9 @@ #ifndef FREERTOS_UDP_IP_H #define FREERTOS_UDP_IP_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ +/* Application level configuration options. */ +#include "FreeRTOSIPConfig.h" +#include "FreeRTOSIPConfigDefaults.h" #include "FreeRTOS_IP.h" /* *INDENT-OFF* */ diff --git a/source/include/NetworkBufferManagement.h b/source/include/NetworkBufferManagement.h index 01a7b5eab..3fd9804a3 100644 --- a/source/include/NetworkBufferManagement.h +++ b/source/include/NetworkBufferManagement.h @@ -28,18 +28,14 @@ #ifndef NETWORK_BUFFER_MANAGEMENT_H #define NETWORK_BUFFER_MANAGEMENT_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ -#include "FreeRTOS_IP.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { #endif /* *INDENT-ON* */ +#include "FreeRTOS_IP.h" + /* _HT_ Two macro's needed while debugging/testing, please ignore. */ #define BUFFER_FROM_WHERE_DECL diff --git a/source/include/NetworkInterface.h b/source/include/NetworkInterface.h index eb2011c46..a9c804cd8 100644 --- a/source/include/NetworkInterface.h +++ b/source/include/NetworkInterface.h @@ -28,18 +28,14 @@ #ifndef NETWORK_INTERFACE_H #define NETWORK_INTERFACE_H -/* Global Includes & Definitions. */ -#include "FreeRTOS_IP_Common.h" - -/* Core FreeRTOS+TCP Includes. */ -#include "FreeRTOS_IP.h" - /* *INDENT-OFF* */ #ifdef __cplusplus extern "C" { #endif /* *INDENT-ON* */ +#include "FreeRTOS_IP.h" + /* INTERNAL API FUNCTIONS. */ /* Since there are multiple interfaces, there are multiple versions