Skip to content

Commit 13fe7a1

Browse files
author
Emil Popov
committed
Merge branch 'main' into MAC_Filtering_PR
2 parents dcedcf6 + 9f4ebd5 commit 13fe7a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+158
-207
lines changed

‎source/FreeRTOS_IP.c

-11
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,6 @@
9292
#endif
9393
#endif
9494

95-
#if ( ipconfigUSE_TCP != 0 )
96-
97-
/** @brief Set to a non-zero value if one or more TCP message have been processed
98-
* within the last round. */
99-
BaseType_t xProcessedTCPMessage;
100-
#endif
101-
10295
/** @brief If ipconfigETHERNET_DRIVER_FILTERS_FRAME_TYPES is set to 1, then the Ethernet
10396
* driver will filter incoming packets and only pass the stack those packets it
10497
* considers need processing. In this case ipCONSIDER_FRAME_FOR_PROCESSING() can
@@ -2029,10 +2022,6 @@ static eFrameProcessingResult_t prvProcessIPPacket( const IPPacket_t * pxIPPacke
20292022
{
20302023
eReturn = eFrameConsumed;
20312024
}
2032-
2033-
/* Setting this variable will cause xTCPTimerCheck()
2034-
* to be called just before the IP-task blocks. */
2035-
xProcessedTCPMessage++;
20362025
break;
20372026
#endif /* if ipconfigUSE_TCP == 1 */
20382027
default:

‎source/FreeRTOS_IP_Timers.c

-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ void vCheckNetworkTimers( void )
301301
* check must be repeated. */
302302
xNextTime = xTCPTimerCheck( xWillSleep );
303303
prvIPTimerStart( &xTCPTimer, xNextTime );
304-
xProcessedTCPMessage = 0;
305304
}
306305
}
307306

‎source/include/FreeRTOS_ARP.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#ifndef FREERTOS_ARP_H
2929
#define FREERTOS_ARP_H
3030

31-
/* Application level configuration options. */
32-
#include "FreeRTOSIPConfig.h"
33-
#include "FreeRTOSIPConfigDefaults.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3433

34+
/* Core FreeRTOS+TCP Includes. */
3535
#include "FreeRTOS_IP.h"
3636

3737
/* *INDENT-OFF* */

‎source/include/FreeRTOS_BitConfig.h

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
#ifndef FREERTOS_BITCONFIG_H
3636
#define FREERTOS_BITCONFIG_H
3737

38+
/* Global Includes & Definitions. */
39+
#include "FreeRTOS_IP_Common.h"
40+
3841
#ifdef __cplusplus
3942
extern "C" {
4043
#endif

‎source/include/FreeRTOS_DHCP.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
#ifndef FREERTOS_DHCP_H
2929
#define FREERTOS_DHCP_H
3030

31-
#include "FreeRTOS.h"
32-
33-
/* Application level configuration options. */
34-
#include "FreeRTOSIPConfig.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3533

34+
/* Core FreeRTOS+TCP Includes. */
3635
#include "FreeRTOS_Sockets.h"
3736

3837
/* *INDENT-OFF* */

‎source/include/FreeRTOS_DHCPv6.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
#ifndef FREERTOS_DHCPV6_H
2727
#define FREERTOS_DHCPV6_H
2828

29-
/* Application level configuration options. */
29+
/* Global Includes & Definitions. */
30+
#include "FreeRTOS_IP_Common.h"
31+
32+
/* Optional FreeRTOS+TCP Includes. */
3033
#include "FreeRTOS_DHCP.h"
31-
#include "FreeRTOSIPConfig.h"
3234

3335
#ifdef __cplusplus
3436
extern "C" {

‎source/include/FreeRTOS_DNS.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@
2828
#ifndef FREERTOS_DNS_H
2929
#define FREERTOS_DNS_H
3030

31-
#include "FreeRTOS.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3233

33-
/* Application level configuration options. */
34-
#include "FreeRTOS_DNS_Globals.h"
35-
#include "FreeRTOS_DNS_Callback.h"
34+
/* Optional FreeRTOS+TCP Includes. */
3635
#include "FreeRTOS_DNS_Cache.h"
36+
#include "FreeRTOS_DNS_Callback.h"
37+
#include "FreeRTOS_DNS_Globals.h"
3738

3839
/* *INDENT-OFF* */
3940
#ifdef __cplusplus

‎source/include/FreeRTOS_DNS_Cache.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@
2828
#ifndef FREERTOS_DNS_CACHE_H
2929
#define FREERTOS_DNS_CACHE_H
3030

31-
/* FreeRTOS includes. */
32-
#include "FreeRTOS.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3333

34+
/* Optional FreeRTOS+TCP Includes. */
3435
#include "FreeRTOS_DNS_Globals.h"
3536

36-
/* Standard includes. */
37-
#include <stdint.h>
38-
3937
#if ( ( ipconfigUSE_DNS_CACHE == 1 ) && ( ipconfigUSE_DNS != 0 ) )
4038

4139
/**

‎source/include/FreeRTOS_DNS_Callback.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,15 @@
2929
#ifndef FREERTOS_DNS_CALLBACK_H
3030
#define FREERTOS_DNS_CALLBACK_H
3131

32-
/* FreeRTOS includes. */
33-
#include "FreeRTOS.h"
32+
/* Global Includes & Definitions. */
33+
#include "FreeRTOS_IP_Common.h"
3434

35-
/* FreeRTOS+TCP includes. */
35+
/* Core FreeRTOS+TCP Includes. */
3636
#include "FreeRTOS_IP.h"
3737

38+
/* Optional FreeRTOS+TCP Includes. */
3839
#include "FreeRTOS_DNS_Globals.h"
3940

40-
/* Standard includes. */
41-
#include <stdint.h>
42-
4341
/* *INDENT-OFF* */
4442
#ifdef __cplusplus
4543
extern "C" {

‎source/include/FreeRTOS_DNS_Globals.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
#ifndef FREERTOS_DNS_GLOBALS_H
2929
#define FREERTOS_DNS_GLOBALS_H
3030

31-
#include "FreeRTOS.h"
32-
33-
#include "FreeRTOSIPConfig.h"
34-
#include "FreeRTOSIPConfigDefaults.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3533

34+
/* Core FreeRTOS+TCP Includes. */
3635
#include "FreeRTOS_Sockets.h"
3736

3837
#define dnsPARSE_ERROR 0UL

‎source/include/FreeRTOS_DNS_Networking.h

+6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,14 @@
2727
#ifndef FREERTOS_DNS_NETWORKING_H
2828
#define FREERTOS_DNS_NETWORKING_H
2929

30+
/* Global Includes & Definitions */
31+
#include "FreeRTOS_IP_Common.h"
32+
33+
/* Core FreeRTOS+TCP Includes. */
3034
#include "FreeRTOS_IP.h"
3135
#include "FreeRTOS_Sockets.h"
36+
37+
/* Optional FreeRTOS+TCP Includes. */
3238
#include "FreeRTOS_DNS_Globals.h"
3339

3440
#if ( ipconfigUSE_DNS != 0 )

‎source/include/FreeRTOS_DNS_Parser.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,15 @@
2828
#ifndef FREERTOS_DNS_PARSER_H
2929
#define FREERTOS_DNS_PARSER_H
3030

31-
/* FreeRTOS includes. */
32-
#include "FreeRTOS.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3333

34-
/* FreeRTOS+TCP includes. */
34+
/* Core FreeRTOS+TCP Includes. */
3535
#include "FreeRTOS_IP.h"
3636

37+
/* Optional FreeRTOS+TCP Includes. */
3738
#include "FreeRTOS_DNS_Globals.h"
3839

39-
/* Standard includes. */
40-
#include <stdint.h>
41-
4240
/* *INDENT-OFF* */
4341
#ifdef __cplusplus
4442
extern "C" {

‎source/include/FreeRTOS_ICMP.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333
#ifndef FREERTOS_ICMP_H
3434
#define FREERTOS_ICMP_H
3535

36-
/* FreeRTOS+TCP includes. */
36+
/* Global Includes & Definitions. */
37+
#include "FreeRTOS_IP_Common.h"
38+
39+
/* Core FreeRTOS+TCP Includes. */
3740
#include "FreeRTOS_IP.h"
3841
#include "FreeRTOS_IP_Private.h"
3942

‎source/include/FreeRTOS_IP.h

+2-16
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@
2828
#ifndef FREERTOS_IP_H
2929
#define FREERTOS_IP_H
3030

31-
#include "FreeRTOS.h"
32-
#include "task.h"
33-
34-
/* Application level configuration options. */
35-
#include "FreeRTOSIPConfig.h"
36-
#include "FreeRTOSIPConfigDefaults.h"
31+
/* Global Includes & Definitions. */
3732
#include "FreeRTOS_IP_Common.h"
3833

3934
/* *INDENT-OFF* */
@@ -485,18 +480,9 @@ extern NetworkBufferDescriptor_t * pxARPWaitingNetworkBuffer;
485480
#define vPrintResourceStats() do {} while( ipFALSE_BOOL ) /**< ipconfigHAS_PRINTF is not defined. Define vPrintResourceStats to a do-while( 0 ). */
486481
#endif
487482

488-
#if ( ipconfigUSE_TCP != 0 )
489-
490-
/** @brief Set to a non-zero value if one or more TCP message have been processed
491-
* within the last round. */
492-
extern BaseType_t xProcessedTCPMessage;
493-
#endif
494-
483+
/* Core FreeRTOS+TCP Includes. */
495484
#include "FreeRTOS_IP_Utils.h" /*TODO can be moved after other 2 includes */
496-
497-
498485
#include "FreeRTOS_IPv4.h"
499-
500486
#include "FreeRTOS_IPv6.h"
501487

502488
/* *INDENT-OFF* */

‎source/include/FreeRTOS_IP_Common.h

+16
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,22 @@
2828
#ifndef FREERTOS_IP_COMMON_H
2929
#define FREERTOS_IP_COMMON_H
3030

31+
/* Standard Includes. */
32+
#include <stdint.h>
33+
#include <stdio.h>
34+
#include <string.h>
35+
36+
/* FreeRTOS Includes. */
37+
#include "FreeRTOS.h"
38+
#include "task.h"
39+
#include "queue.h"
40+
#include "semphr.h"
41+
#include "event_groups.h"
42+
43+
/* Application Level Configuration Options. */
44+
#include "FreeRTOSIPConfig.h"
45+
#include "FreeRTOSIPConfigDefaults.h"
46+
3147
/* *INDENT-OFF* */
3248
#ifdef __cplusplus
3349
extern "C" {

‎source/include/FreeRTOS_IP_Private.h

+8-12
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,17 @@
2828
#ifndef FREERTOS_IP_PRIVATE_H
2929
#define FREERTOS_IP_PRIVATE_H
3030

31-
/* Application level configuration options. */
32-
#include "FreeRTOSIPConfig.h"
33-
#include "FreeRTOSIPConfigDefaults.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
33+
34+
/* Core FreeRTOS+TCP Includes. */
35+
#include "FreeRTOS_Routing.h"
3436
#include "FreeRTOS_Sockets.h"
3537
#include "FreeRTOS_Stream_Buffer.h"
36-
#include "FreeRTOS_Routing.h"
37-
38-
#if ( ipconfigUSE_TCP == 1 )
39-
#include "FreeRTOS_TCP_WIN.h"
40-
#include "FreeRTOS_TCP_IP.h"
41-
#endif
42-
43-
#include "semphr.h"
4438

45-
#include "event_groups.h"
39+
/* Optional FreeRTOS+TCP Includes. */
40+
#include "FreeRTOS_TCP_WIN.h"
41+
#include "FreeRTOS_TCP_IP.h"
4642

4743
/* *INDENT-OFF* */
4844
#ifdef __cplusplus

‎source/include/FreeRTOS_IP_Timers.h

+9-15
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,20 @@
3333
#ifndef FREERTOS_IP_TIMERS_H
3434
#define FREERTOS_IP_TIMERS_H
3535

36-
/* Standard includes. */
37-
#include <stdint.h>
38-
#include <stdio.h>
39-
#include <string.h>
40-
41-
/* FreeRTOS includes. */
42-
#include "FreeRTOS.h"
43-
#include "task.h"
44-
#include "queue.h"
45-
#include "semphr.h"
46-
47-
/* FreeRTOS+TCP includes. */
36+
/* Global Includes & Definitions. */
37+
#include "FreeRTOS_IP_Common.h"
38+
39+
/* Core FreeRTOS+TCP Includes. */
4840
#include "FreeRTOS_IP.h"
49-
#include "FreeRTOS_Sockets.h"
5041
#include "FreeRTOS_IP_Private.h"
51-
#include "FreeRTOS_ARP.h"
42+
#include "FreeRTOS_Sockets.h"
5243
#include "FreeRTOS_UDP_IP.h"
53-
#include "FreeRTOS_DHCP.h"
5444
#include "NetworkInterface.h"
5545
#include "NetworkBufferManagement.h"
46+
47+
/* Optional FreeRTOS+TCP Includes. */
48+
#include "FreeRTOS_ARP.h"
49+
#include "FreeRTOS_DHCP.h"
5650
#include "FreeRTOS_DNS.h"
5751

5852
/* *INDENT-OFF* */

‎source/include/FreeRTOS_IP_Utils.h

+9-16
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,21 @@
3333
#ifndef FREERTOS_IP_UTILS_H
3434
#define FREERTOS_IP_UTILS_H
3535

36-
/* Standard includes. */
37-
#include <stdint.h>
38-
#include <stdio.h>
39-
#include <string.h>
40-
41-
/* FreeRTOS includes. */
42-
#include "FreeRTOS.h"
43-
#include "task.h"
44-
#include "queue.h"
45-
#include "semphr.h"
46-
47-
/* FreeRTOS+TCP includes. */
36+
/* Global Includes & Definitions. */
37+
#include "FreeRTOS_IP_Common.h"
38+
39+
/* Core FreeRTOS+TCP Includes. */
4840
#include "FreeRTOS_IP.h"
49-
#include "FreeRTOS_Sockets.h"
50-
#include "FreeRTOS_Routing.h"
5141
#include "FreeRTOS_IP_Private.h"
42+
#include "FreeRTOS_Routing.h"
43+
#include "FreeRTOS_Sockets.h"
5244
#include "FreeRTOS_UDP_IP.h"
53-
#include "FreeRTOS_DHCP.h"
5445
#include "NetworkInterface.h"
5546
#include "NetworkBufferManagement.h"
56-
#include "FreeRTOS_DNS.h"
5747

48+
/* Optional FreeRTOS+TCP Includes. */
49+
#include "FreeRTOS_DHCP.h"
50+
#include "FreeRTOS_DNS.h"
5851
#include "FreeRTOS_IPv4_Utils.h"
5952
#include "FreeRTOS_IPv6_Utils.h"
6053

‎source/include/FreeRTOS_IPv4.h

+2-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@
2828
#ifndef FREERTOS_IPV4_H
2929
#define FREERTOS_IPV4_H
3030

31-
#include "FreeRTOS.h"
32-
#include "task.h"
33-
34-
/* Application level configuration options. */
35-
#include "FreeRTOSIPConfig.h"
36-
#include "FreeRTOSIPConfigDefaults.h"
31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
3733

3834
/* *INDENT-OFF* */
3935
#ifdef __cplusplus

‎source/include/FreeRTOS_IPv4_Private.h

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
#ifndef FREERTOS_IPV4_PRIVATE_H
2929
#define FREERTOS_IPV4_PRIVATE_H
3030

31+
/* Global Includes & Definitions. */
32+
#include "FreeRTOS_IP_Common.h"
33+
34+
/* Core FreeRTOS+TCP Includes. */
3135
#include "FreeRTOS_IP_Private.h"
3236

3337
/* *INDENT-OFF* */

0 commit comments

Comments
 (0)