Skip to content

Commit b3289a7

Browse files
authored
Remove obsolete config structs
This PR removes the xNetworkAddressing and xDefaultAddressing structs as they appear to be obsolete.
2 parents a91c311 + 0ebf0c2 commit b3289a7

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

source/FreeRTOS_DHCP.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656

5757
#include "FreeRTOS_Routing.h"
5858

59-
/* The following define is temporary and serves to make the /single source
60-
* code more similar to the /multi version. */
61-
6259
#define EP_DHCPData pxEndPoint->xDHCPData /**< Temporary define to make /single source similar to /multi version. */
6360
#define EP_IPv4_SETTINGS pxEndPoint->ipv4_settings /**< Temporary define to make /single source similar to /multi version. */
6461

source/FreeRTOS_IP.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,6 @@ uint16_t usPacketIdentifier = 0U;
185185
* reference. */
186186
const MACAddress_t xBroadcastMACAddress = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
187187

188-
/** @brief Default values for the above struct in case DHCP
189-
* does not lead to a confirmed request. */
190-
191-
/* MISRA Ref 8.9.1 [File scoped variables] */
192-
/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-89 */
193-
/* coverity[misra_c_2012_rule_8_9_violation] */
194-
NetworkAddressingParameters_t xDefaultAddressing = { 0, 0, 0, 0, 0 };
195-
196188
/** @brief Used to ensure network down events cannot be missed when they cannot be
197189
* posted to the network event queue because the network event queue is already
198190
* full. */

source/include/FreeRTOS_DHCP.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@
103103
#define dhcpADDRESS_TYPE_ETHERNET ( 1U ) /**< Address type: ethernet opcode. */
104104
#define dhcpETHERNET_ADDRESS_LENGTH ( 6U ) /**< Ethernet address length opcode. */
105105

106-
/* The following define is temporary and serves to make the /single source
107-
* code more similar to the /multi version. TODO */
108-
//#define EP_DHCPData xDHCPData /**< Temporary define to make /single source similar to /multi version. */
109-
//#define EP_IPv4_SETTINGS xNetworkAddressing /**< Temporary define to make /single source similar to /multi version. */
110-
111106
/** @brief If a lease time is not received, use the default of two days (48 hours in ticks).
112107
* Can not use pdMS_TO_TICKS() as integer overflow can occur. */
113108
#define dhcpDEFAULT_LEASE_TIME ( ( 48UL * 60UL * 60UL ) * configTICK_RATE_HZ )

source/include/FreeRTOS_IP_Private.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -339,15 +339,6 @@ typedef union xUDPPacketHeader
339339
extern UDPPacketHeader_t xDefaultPartUDPPacketHeader;
340340

341341

342-
/* Structure that stores the netmask, gateway address and DNS server addresses. */
343-
extern NetworkAddressingParameters_t xNetworkAddressing;
344-
345-
/* Structure that stores the defaults for netmask, gateway address and DNS.
346-
* These values will be copied to 'xNetworkAddressing' in case DHCP is not used,
347-
* and also in case DHCP does not lead to a confirmed request. */
348-
/*lint -e9003*/
349-
extern NetworkAddressingParameters_t xDefaultAddressing; /*lint !e9003 could define variable 'xDefaultAddressing' at block scope [MISRA 2012 Rule 8.9, advisory]. */
350-
351342
/* True when BufferAllocation_1.c was included, false for BufferAllocation_2.c */
352343
extern const BaseType_t xBufferAllocFixedSize;
353344

0 commit comments

Comments
 (0)