From d1222ce158761146fc5a015f178ccb665c3b55b8 Mon Sep 17 00:00:00 2001 From: xiehang Date: Thu, 24 Dec 2020 11:56:18 +0800 Subject: [PATCH 1/3] esp_wifi: Refactor wifi_interface_t --- components/esp_wifi/include/esp_wifi_types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index b392552728..2deb57caf1 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -30,10 +30,10 @@ typedef enum { WIFI_MODE_MAX } wifi_mode_t; -typedef esp_interface_t wifi_interface_t; - -#define WIFI_IF_STA ESP_IF_WIFI_STA -#define WIFI_IF_AP ESP_IF_WIFI_AP +typedef enum { + WIFI_IF_STA = ESP_IF_WIFI_STA, + WIFI_IF_AP = ESP_IF_WIFI_AP, +} wifi_interface_t; typedef enum { WIFI_COUNTRY_POLICY_AUTO, /**< Country policy is auto, use the country info of AP to which the station is connected */ From 0cbb7d503d4db2ba8f7ef914d4dbfa5c4cff1145 Mon Sep 17 00:00:00 2001 From: xiehang Date: Mon, 21 Dec 2020 16:55:57 +0800 Subject: [PATCH 2/3] esp_wifi: Update WiFi lib 1. Refactor wifi_interface_t 2. Faster WiFi station connect improvement, avoid 100ms passive scan 3. Add FCS failed packets filter 4. Update esp32 phy lib to v4660 Closes https://github.com/espressif/esp-idf/issues/986 --- components/esp_wifi/include/esp_wifi_types.h | 1 + components/esp_wifi/lib | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index 2deb57caf1..879392099d 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -392,6 +392,7 @@ typedef enum { #define WIFI_PROMIS_FILTER_MASK_MISC (1<<3) /**< filter the packets with type of WIFI_PKT_MISC */ #define WIFI_PROMIS_FILTER_MASK_DATA_MPDU (1<<4) /**< filter the MPDU which is a kind of WIFI_PKT_DATA */ #define WIFI_PROMIS_FILTER_MASK_DATA_AMPDU (1<<5) /**< filter the AMPDU which is a kind of WIFI_PKT_DATA */ +#define WIFI_PROMIS_FILTER_MASK_FCSFAIL (1<<6) /**< filter the FCS failed packets, do not open it in general */ #define WIFI_PROMIS_CTRL_FILTER_MASK_ALL (0xFF800000) /**< filter all control packets */ #define WIFI_PROMIS_CTRL_FILTER_MASK_WRAPPER (1<<23) /**< filter the control packets with subtype of Control Wrapper */ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 8fa1751c0d..b7dc7bb088 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 8fa1751c0d9d082952d275e16086bacb225409a9 +Subproject commit b7dc7bb088473d638765b5a0798ed0f23bb01aad From c41f4a122a5152a87d5240e1b19081a332bde306 Mon Sep 17 00:00:00 2001 From: xiehang Date: Wed, 23 Dec 2020 19:47:04 +0800 Subject: [PATCH 3/3] esp_wifi: ESP32 phy add [sections:phy_iram] --- components/esp32/ld/esp32_fragments.lf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/components/esp32/ld/esp32_fragments.lf b/components/esp32/ld/esp32_fragments.lf index feaec8b1ac..4c6b0a9ddb 100644 --- a/components/esp32/ld/esp32_fragments.lf +++ b/components/esp32/ld/esp32_fragments.lf @@ -92,6 +92,10 @@ entries: entries: .wifirxiram+ +[sections:phy_iram] +entries: + .phyiram+ + [scheme:default] entries: if APP_BUILD_USE_FLASH_SECTIONS = y: @@ -118,6 +122,7 @@ entries: rtc_bss -> rtc_bss wifi_iram -> flash_text wifi_rx_iram -> flash_text + phy_iram -> flash_text dram_coredump -> dram_coredump iram_coredump -> iram_coredump rtc_coredump -> rtc_coredump @@ -152,6 +157,10 @@ entries: entries: wifi_rx_iram -> iram0_text +[scheme:phy_iram] +entries: + phy_iram -> iram0_text + [scheme:extram_bss] entries: bss -> extern_ram