From dffbce9813dd1980b247105bbb240ea206977d19 Mon Sep 17 00:00:00 2001 From: xiehang Date: Tue, 19 Jan 2021 11:58:04 +0800 Subject: [PATCH] esp_wifi: Modify ESP_IF_WIFI_AP to WIFI_IF_AP --- components/esp_wifi/test/test_wifi.c | 4 ++-- components/wifi_provisioning/src/scheme_softap.c | 2 +- .../ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c | 2 +- examples/ethernet/eth2ap/main/ethernet_example_main.c | 8 ++++---- examples/mesh/ip_internal_network/main/mesh_netif.c | 2 +- .../provisioning/legacy/custom_config/main/app_prov.c | 2 +- examples/provisioning/legacy/softap_prov/main/app_prov.c | 2 +- .../getting_started/softAP/main/softap_example_main.c | 2 +- examples/wifi/iperf/main/cmd_wifi.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/components/esp_wifi/test/test_wifi.c b/components/esp_wifi/test/test_wifi.c index e8627c637a..c33361f6ed 100644 --- a/components/esp_wifi/test/test_wifi.c +++ b/components/esp_wifi/test/test_wifi.c @@ -267,7 +267,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(); @@ -329,7 +329,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/wifi_provisioning/src/scheme_softap.c b/components/wifi_provisioning/src/scheme_softap.c index fe25c1d613..289b1a4c62 100644 --- a/components/wifi_provisioning/src/scheme_softap.c +++ b/components/wifi_provisioning/src/scheme_softap.c @@ -63,7 +63,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 db7937e8d6..40e67a3281 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 @@ -246,7 +246,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/ethernet/eth2ap/main/ethernet_example_main.c b/examples/ethernet/eth2ap/main/ethernet_example_main.c index 246ec9754e..a61416e0fc 100644 --- a/examples/ethernet/eth2ap/main/ethernet_example_main.c +++ b/examples/ethernet/eth2ap/main/ethernet_example_main.c @@ -83,7 +83,7 @@ static void eth2wifi_flow_control_task(void *args) do { vTaskDelay(pdMS_TO_TICKS(timeout)); timeout += 2; - res = esp_wifi_internal_tx(ESP_IF_WIFI_AP, msg.packet, msg.length); + res = esp_wifi_internal_tx(WIFI_IF_AP, msg.packet, msg.length); } while (res && timeout < FLOW_CONTROL_WIFI_SEND_TIMEOUT_MS); if (res != ESP_OK) { ESP_LOGE(TAG, "WiFi send packet failed: %d", res); @@ -133,7 +133,7 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base, ESP_LOGI(TAG, "Wi-Fi AP got a station connected"); if (!s_con_cnt) { s_sta_is_connected = true; - esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, pkt_wifi2eth); + esp_wifi_internal_reg_rxcb(WIFI_IF_AP, pkt_wifi2eth); } s_con_cnt++; break; @@ -142,7 +142,7 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base, s_con_cnt--; if (!s_con_cnt) { s_sta_is_connected = false; - esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, NULL); + esp_wifi_internal_reg_rxcb(WIFI_IF_AP, NULL); } break; default: @@ -250,7 +250,7 @@ static void initialize_wifi(void) wifi_config.ap.authmode = WIFI_AUTH_OPEN; } 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)); } static esp_err_t initialize_flow_control(void) diff --git a/examples/mesh/ip_internal_network/main/mesh_netif.c b/examples/mesh/ip_internal_network/main/mesh_netif.c index d0a3aa2f27..1f5723693a 100644 --- a/examples/mesh/ip_internal_network/main/mesh_netif.c +++ b/examples/mesh/ip_internal_network/main/mesh_netif.c @@ -289,7 +289,7 @@ esp_err_t mesh_netifs_init(mesh_raw_recv_cb_t *cb) static esp_err_t start_mesh_link_ap(void) { uint8_t mac[MAC_ADDR_LEN]; - esp_wifi_get_mac(ESP_IF_WIFI_AP, mac); + esp_wifi_get_mac(WIFI_IF_AP, mac); esp_netif_set_mac(netif_ap, mac); esp_netif_action_start(netif_ap, NULL, 0, NULL); return ESP_OK; diff --git a/examples/provisioning/legacy/custom_config/main/app_prov.c b/examples/provisioning/legacy/custom_config/main/app_prov.c index 76b941fb96..c81ab21966 100644 --- a/examples/provisioning/legacy/custom_config/main/app_prov.c +++ b/examples/provisioning/legacy/custom_config/main/app_prov.c @@ -319,7 +319,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/legacy/softap_prov/main/app_prov.c b/examples/provisioning/legacy/softap_prov/main/app_prov.c index 3560103f18..c57aa6ac18 100644 --- a/examples/provisioning/legacy/softap_prov/main/app_prov.c +++ b/examples/provisioning/legacy/softap_prov/main/app_prov.c @@ -305,7 +305,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 cf994be0bc..e252151486 100644 --- a/examples/wifi/getting_started/softAP/main/softap_example_main.c +++ b/examples/wifi/getting_started/softAP/main/softap_example_main.c @@ -74,7 +74,7 @@ void wifi_init_softap(void) } 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 bfd70b4f1d..ebfd0ea779 100644 --- a/examples/wifi/iperf/main/cmd_wifi.c +++ b/examples/wifi/iperf/main/cmd_wifi.c @@ -238,7 +238,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; }