From 2091f4db1c913c2cfa77f13e63dc8865da3d44b2 Mon Sep 17 00:00:00 2001 From: xiehang Date: Wed, 27 Jan 2021 14:50:36 +0800 Subject: [PATCH] esp_wifi: Modify WIFI_IF_AP to TCPIP_ADAPTER_IF_AP --- components/ethernet/test/test_emac_deinit.c | 2 +- components/lwip/apps/dhcpserver/dhcpserver.c | 2 +- components/tcpip_adapter/tcpip_adapter_lwip.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/ethernet/test/test_emac_deinit.c b/components/ethernet/test/test_emac_deinit.c index 3b540728a6..5c22a2273c 100644 --- a/components/ethernet/test/test_emac_deinit.c +++ b/components/ethernet/test/test_emac_deinit.c @@ -88,7 +88,7 @@ static esp_err_t eth_event_handler(void *ctx, system_event_t *event) break; case SYSTEM_EVENT_ETH_GOT_IP: memset(&ip, 0, sizeof(tcpip_adapter_ip_info_t)); - ESP_ERROR_CHECK(tcpip_adapter_get_ip_info(ESP_IF_ETH, &ip)); + ESP_ERROR_CHECK(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_ETH, &ip)); ESP_LOGI(TAG, "Ethernet Got IP Addr"); ESP_LOGI(TAG, "~~~~~~~~~~~"); ESP_LOGI(TAG, "ETHIP:" IPSTR, IP2STR(&ip.ip)); diff --git a/components/lwip/apps/dhcpserver/dhcpserver.c b/components/lwip/apps/dhcpserver/dhcpserver.c index 4a43273a31..68a87a3ce2 100644 --- a/components/lwip/apps/dhcpserver/dhcpserver.c +++ b/components/lwip/apps/dhcpserver/dhcpserver.c @@ -329,7 +329,7 @@ static u8_t *add_offer_options(u8_t *optptr) //bzero(&if_ip, sizeof(struct ip_info)); memset(&if_ip , 0x00, sizeof(tcpip_adapter_ip_info_t)); - tcpip_adapter_get_ip_info(WIFI_IF_AP, &if_ip); + tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &if_ip); if (!ip4_addr_isany_val(if_ip.gw)) { *optptr++ = DHCP_OPTION_ROUTER; diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c index 5ac52a4178..0efa643081 100644 --- a/components/tcpip_adapter/tcpip_adapter_lwip.c +++ b/components/tcpip_adapter/tcpip_adapter_lwip.c @@ -683,7 +683,7 @@ esp_err_t tcpip_adapter_dhcps_option(tcpip_adapter_dhcp_option_mode_t opt_op, tc if (poll->enable) { memset(&info, 0x00, sizeof(tcpip_adapter_ip_info_t)); - tcpip_adapter_get_ip_info(WIFI_IF_AP, &info); + tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &info); softap_ip = htonl(info.ip.addr); start_ip = htonl(poll->start_ip.addr); end_ip = htonl(poll->end_ip.addr); @@ -854,7 +854,7 @@ esp_err_t tcpip_adapter_dhcps_start(tcpip_adapter_if_t tcpip_if) if (p_netif != NULL && netif_is_up(p_netif)) { tcpip_adapter_ip_info_t default_ip; - tcpip_adapter_get_ip_info(WIFI_IF_AP, &default_ip); + tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &default_ip); dhcps_set_new_lease_cb(tcpip_adapter_dhcps_cb); dhcps_start(p_netif, default_ip.ip); dhcps_status = TCPIP_ADAPTER_DHCP_STARTED;