From 1975d39d44e6c422aac7f3e0a74301fe6de38172 Mon Sep 17 00:00:00 2001 From: xiehang Date: Tue, 19 Jan 2021 15:37:11 +0800 Subject: [PATCH] esp_wifi: Modify ESP_IF_WIFI_AP to WIFI_IF_AP --- components/esp32/event_default_handlers.c | 6 +++--- components/esp32/test/test_wifi.c | 4 ++-- components/lwip/apps/dhcpserver/dhcpserver.c | 2 +- components/lwip/port/esp32/netif/dhcp_state.c | 2 +- components/tcpip_adapter/tcpip_adapter_lwip.c | 4 ++-- components/wifi_provisioning/src/scheme_softap.c | 2 +- .../ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c | 2 +- examples/provisioning/custom_config/main/app_prov.c | 2 +- examples/provisioning/softap_prov/main/app_prov.c | 2 +- .../wifi/getting_started/softAP/main/softap_example_main.c | 2 +- examples/wifi/iperf/main/cmd_wifi.c | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/esp32/event_default_handlers.c b/components/esp32/event_default_handlers.c index b4e884aaec..43305aee0b 100644 --- a/components/esp32/event_default_handlers.c +++ b/components/esp32/event_default_handlers.c @@ -209,8 +209,8 @@ esp_err_t system_event_ap_start_handle_default(system_event_t *event) tcpip_adapter_ip_info_t ap_ip; uint8_t ap_mac[6]; - WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, (wifi_rxcb_t)tcpip_adapter_ap_input), ESP_OK); - WIFI_API_CALL_CHECK("esp_wifi_mac_get", esp_wifi_get_mac(ESP_IF_WIFI_AP, ap_mac), ESP_OK); + WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(WIFI_IF_AP, (wifi_rxcb_t)tcpip_adapter_ap_input), ESP_OK); + WIFI_API_CALL_CHECK("esp_wifi_mac_get", esp_wifi_get_mac(WIFI_IF_AP, ap_mac), ESP_OK); tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ap_ip); tcpip_adapter_ap_start(ap_mac, &ap_ip); @@ -220,7 +220,7 @@ esp_err_t system_event_ap_start_handle_default(system_event_t *event) esp_err_t system_event_ap_stop_handle_default(system_event_t *event) { - WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, NULL), ESP_OK); + WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(WIFI_IF_AP, NULL), ESP_OK); tcpip_adapter_stop(TCPIP_ADAPTER_IF_AP); diff --git a/components/esp32/test/test_wifi.c b/components/esp32/test/test_wifi.c index e586156b5a..9cc49a6b2e 100644 --- a/components/esp32/test/test_wifi.c +++ b/components/esp32/test/test_wifi.c @@ -238,7 +238,7 @@ static void send_ds2ds_packet(void) // send packet 20 times to make sure receiver will get this packet for (uint16_t i = 0; i < 20; i++) { - esp_wifi_80211_tx(ESP_IF_WIFI_AP, ds2ds_pdu, sizeof(ds2ds_pdu), true); + esp_wifi_80211_tx(WIFI_IF_AP, ds2ds_pdu, sizeof(ds2ds_pdu), true); vTaskDelay(50 / portTICK_PERIOD_MS); } stop_wifi(); @@ -299,7 +299,7 @@ static void test_wifi_connection_softap(void) start_wifi_as_softap(); - TEST_ESP_OK(esp_wifi_get_mac(ESP_IF_WIFI_AP, mac)); + TEST_ESP_OK(esp_wifi_get_mac(WIFI_IF_AP, mac)); sprintf(mac_str, MACSTR, MAC2STR(mac)); unity_send_signal_param("SoftAP mac", mac_str); diff --git a/components/lwip/apps/dhcpserver/dhcpserver.c b/components/lwip/apps/dhcpserver/dhcpserver.c index 5e0c1a6780..4a43273a31 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(ESP_IF_WIFI_AP, &if_ip); + tcpip_adapter_get_ip_info(WIFI_IF_AP, &if_ip); if (!ip4_addr_isany_val(if_ip.gw)) { *optptr++ = DHCP_OPTION_ROUTER; diff --git a/components/lwip/port/esp32/netif/dhcp_state.c b/components/lwip/port/esp32/netif/dhcp_state.c index 9301ff3b0c..4318de8f96 100644 --- a/components/lwip/port/esp32/netif/dhcp_state.c +++ b/components/lwip/port/esp32/netif/dhcp_state.c @@ -84,4 +84,4 @@ void dhcp_ip_addr_erase(void *netif) nvs_close(nvs); } } -} \ No newline at end of file +} diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c index 03f9bfb64d..5ac52a4178 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(ESP_IF_WIFI_AP, &info); + tcpip_adapter_get_ip_info(WIFI_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(ESP_IF_WIFI_AP, &default_ip); + tcpip_adapter_get_ip_info(WIFI_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; diff --git a/components/wifi_provisioning/src/scheme_softap.c b/components/wifi_provisioning/src/scheme_softap.c index 2b0c3c242b..ebb42760a3 100644 --- a/components/wifi_provisioning/src/scheme_softap.c +++ b/components/wifi_provisioning/src/scheme_softap.c @@ -60,7 +60,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass) ESP_LOGE(TAG, "Failed to set Wi-Fi mode : %d", err); return err; } - err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config); + err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config); if (err != ESP_OK) { ESP_LOGE(TAG, "Failed to set Wi-Fi config : %d", err); return err; diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c index f0763e7483..087a6af9f8 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c @@ -227,7 +227,7 @@ static bool wifi_cmd_ap_set(const char *ssid, const char *pass) } ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP)); - ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); + ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config)); return true; } diff --git a/examples/provisioning/custom_config/main/app_prov.c b/examples/provisioning/custom_config/main/app_prov.c index 977932ff9d..abd75f5f37 100644 --- a/examples/provisioning/custom_config/main/app_prov.c +++ b/examples/provisioning/custom_config/main/app_prov.c @@ -342,7 +342,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass) ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err); return err; } - err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config); + err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config); if (err != ESP_OK) { ESP_LOGE(TAG, "Failed to set WiFi config : %d", err); return err; diff --git a/examples/provisioning/softap_prov/main/app_prov.c b/examples/provisioning/softap_prov/main/app_prov.c index 19f494d4f0..c445d6e829 100644 --- a/examples/provisioning/softap_prov/main/app_prov.c +++ b/examples/provisioning/softap_prov/main/app_prov.c @@ -329,7 +329,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass) ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err); return err; } - err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config); + err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config); if (err != ESP_OK) { ESP_LOGE(TAG, "Failed to set WiFi config : %d", err); return err; diff --git a/examples/wifi/getting_started/softAP/main/softap_example_main.c b/examples/wifi/getting_started/softAP/main/softap_example_main.c index f1388dead5..18a3013b99 100644 --- a/examples/wifi/getting_started/softAP/main/softap_example_main.c +++ b/examples/wifi/getting_started/softAP/main/softap_example_main.c @@ -77,7 +77,7 @@ void wifi_init_softap() } ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP)); - ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); + ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config)); ESP_ERROR_CHECK(esp_wifi_start()); ESP_LOGI(TAG, "wifi_init_softap finished. SSID:%s password:%s channel:%d", diff --git a/examples/wifi/iperf/main/cmd_wifi.c b/examples/wifi/iperf/main/cmd_wifi.c index 9258e8477a..0b46772298 100644 --- a/examples/wifi/iperf/main/cmd_wifi.c +++ b/examples/wifi/iperf/main/cmd_wifi.c @@ -221,7 +221,7 @@ static bool wifi_cmd_ap_set(const char* ssid, const char* pass) } ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP)); - ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config)); + ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config)); return true; }