Skip to content

Revert "Fix header includes" #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2024
+170 −157
Merged

Revert "Fix header includes" #1125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/include/FreeRTOS_ARP.h
View file
Original file line number Diff line number Diff line change
@@ -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* */
3 changes: 0 additions & 3 deletions source/include/FreeRTOS_BitConfig.h
View file
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions source/include/FreeRTOS_DHCP.h
View file
Original file line number Diff line number Diff line change
@@ -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* */
6 changes: 2 additions & 4 deletions source/include/FreeRTOS_DHCPv6.h
View file
Original file line number Diff line number Diff line change
@@ -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" {
9 changes: 4 additions & 5 deletions source/include/FreeRTOS_DNS.h
View file
Original file line number Diff line number Diff line change
@@ -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
8 changes: 5 additions & 3 deletions source/include/FreeRTOS_DNS_Cache.h
View file
Original file line number Diff line number Diff line change
@@ -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 <stdint.h>

#if ( ( ipconfigUSE_DNS_CACHE == 1 ) && ( ipconfigUSE_DNS != 0 ) )

/**
10 changes: 6 additions & 4 deletions source/include/FreeRTOS_DNS_Callback.h
View file
Original file line number Diff line number Diff line change
@@ -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 <stdint.h>

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
7 changes: 4 additions & 3 deletions source/include/FreeRTOS_DNS_Globals.h
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 0 additions & 6 deletions source/include/FreeRTOS_DNS_Networking.h
View file
Original file line number Diff line number Diff line change
@@ -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 )
10 changes: 6 additions & 4 deletions source/include/FreeRTOS_DNS_Parser.h
View file
Original file line number Diff line number Diff line change
@@ -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 <stdint.h>

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
5 changes: 1 addition & 4 deletions source/include/FreeRTOS_ICMP.h
View file
Original file line number Diff line number Diff line change
@@ -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"

11 changes: 9 additions & 2 deletions source/include/FreeRTOS_IP.h
View file
Original file line number Diff line number Diff line change
@@ -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* */
16 changes: 0 additions & 16 deletions source/include/FreeRTOS_IP_Common.h
View file
Original file line number Diff line number Diff line change
@@ -28,22 +28,6 @@
#ifndef FREERTOS_IP_COMMON_H
#define FREERTOS_IP_COMMON_H

/* Standard Includes. */
#include <stdint.h>
#include <stdio.h>
#include <string.h>

/* 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" {
20 changes: 12 additions & 8 deletions source/include/FreeRTOS_IP_Private.h
View file
Original file line number Diff line number Diff line change
@@ -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
24 changes: 15 additions & 9 deletions source/include/FreeRTOS_IP_Timers.h
View file
Original file line number Diff line number Diff line change
@@ -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 <stdint.h>
#include <stdio.h>
#include <string.h>

/* 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* */
25 changes: 16 additions & 9 deletions source/include/FreeRTOS_IP_Utils.h
View file
Original file line number Diff line number Diff line change
@@ -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 <stdint.h>
#include <stdio.h>
#include <string.h>

/* 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"

8 changes: 6 additions & 2 deletions source/include/FreeRTOS_IPv4.h
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions source/include/FreeRTOS_IPv4_Private.h
View file
Original file line number Diff line number Diff line change
@@ -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* */
7 changes: 5 additions & 2 deletions source/include/FreeRTOS_IPv4_Sockets.h
View file
Original file line number Diff line number Diff line change
@@ -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 <string.h>

/* FreeRTOS includes. */
#include "FreeRTOS.h"

#ifdef __cplusplus
extern "C" {
10 changes: 7 additions & 3 deletions source/include/FreeRTOS_IPv4_Utils.h
View file
Original file line number Diff line number Diff line change
@@ -33,10 +33,14 @@
* @brief Implements the utility functions for FreeRTOS_IP.c
*/

/* Global Includes & Definitions. */
#include "FreeRTOS_IP_Common.h"
/* Standard includes. */
#include <stdint.h>
#include <stdio.h>

/* Core FreeRTOS+TCP Includes. */
/* FreeRTOS includes. */
#include "FreeRTOS.h"

/* FreeRTOS+TCP includes. */
#include "FreeRTOS_IP.h"

/* *INDENT-OFF* */
Loading