mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
Moved static variable from inside the function to global scope
This commit is contained in:
parent
5b04860b8b
commit
732cac1c0e
@ -126,6 +126,11 @@ u32_t dhcp_rx_options_val[DHCP_OPTION_IDX_MAX];
|
|||||||
@todo: move this into struct dhcp? */
|
@todo: move this into struct dhcp? */
|
||||||
u8_t dhcp_rx_options_given[DHCP_OPTION_IDX_MAX];
|
u8_t dhcp_rx_options_given[DHCP_OPTION_IDX_MAX];
|
||||||
|
|
||||||
|
#ifdef DHCP_GLOBAL_XID
|
||||||
|
static u32_t xid;
|
||||||
|
static u8_t xid_initialised;
|
||||||
|
#endif /* DHCP_GLOBAL_XID */
|
||||||
|
|
||||||
#define dhcp_option_given(dhcp, idx) (dhcp_rx_options_given[idx] != 0)
|
#define dhcp_option_given(dhcp, idx) (dhcp_rx_options_given[idx] != 0)
|
||||||
#define dhcp_got_option(dhcp, idx) (dhcp_rx_options_given[idx] = 1)
|
#define dhcp_got_option(dhcp, idx) (dhcp_rx_options_given[idx] = 1)
|
||||||
#define dhcp_clear_option(dhcp, idx) (dhcp_rx_options_given[idx] = 0)
|
#define dhcp_clear_option(dhcp, idx) (dhcp_rx_options_given[idx] = 0)
|
||||||
@ -1628,8 +1633,6 @@ dhcp_create_msg(struct netif *netif, struct dhcp *dhcp, u8_t message_type)
|
|||||||
* at runtime, any supporting function prototypes can be defined in DHCP_GLOBAL_XID_HEADER */
|
* at runtime, any supporting function prototypes can be defined in DHCP_GLOBAL_XID_HEADER */
|
||||||
static u32_t xid = 0xABCD0000;
|
static u32_t xid = 0xABCD0000;
|
||||||
#else
|
#else
|
||||||
static u32_t xid;
|
|
||||||
static u8_t xid_initialised = 0;
|
|
||||||
if (!xid_initialised) {
|
if (!xid_initialised) {
|
||||||
xid = DHCP_GLOBAL_XID;
|
xid = DHCP_GLOBAL_XID;
|
||||||
xid_initialised = !xid_initialised;
|
xid_initialised = !xid_initialised;
|
||||||
|
@ -82,6 +82,8 @@
|
|||||||
struct netif *netif_list;
|
struct netif *netif_list;
|
||||||
struct netif *netif_default;
|
struct netif *netif_default;
|
||||||
|
|
||||||
|
static u8_t netif_num;
|
||||||
|
|
||||||
#if LWIP_HAVE_LOOPIF
|
#if LWIP_HAVE_LOOPIF
|
||||||
static struct netif loop_netif;
|
static struct netif loop_netif;
|
||||||
|
|
||||||
@ -144,7 +146,6 @@ struct netif *
|
|||||||
netif_add(struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask,
|
netif_add(struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask,
|
||||||
ip_addr_t *gw, void *state, netif_init_fn init, netif_input_fn input)
|
ip_addr_t *gw, void *state, netif_init_fn init, netif_input_fn input)
|
||||||
{
|
{
|
||||||
static u8_t netifnum = 0;
|
|
||||||
#if LWIP_IPV6
|
#if LWIP_IPV6
|
||||||
u32_t i;
|
u32_t i;
|
||||||
#endif
|
#endif
|
||||||
@ -200,7 +201,7 @@ netif_add(struct netif *netif, ip_addr_t *ipaddr, ip_addr_t *netmask,
|
|||||||
|
|
||||||
/* remember netif specific state information data */
|
/* remember netif specific state information data */
|
||||||
netif->state = state;
|
netif->state = state;
|
||||||
netif->num = netifnum++;
|
netif->num = netif_num++;
|
||||||
netif->input = input;
|
netif->input = input;
|
||||||
NETIF_SET_HWADDRHINT(netif, NULL);
|
NETIF_SET_HWADDRHINT(netif, NULL);
|
||||||
#if ENABLE_LOOPBACK && LWIP_LOOPBACK_MAX_PBUFS
|
#if ENABLE_LOOPBACK && LWIP_LOOPBACK_MAX_PBUFS
|
||||||
|
Loading…
Reference in New Issue
Block a user