From a182c0682e2383a92b8825aa1b88169d44385422 Mon Sep 17 00:00:00 2001 From: ChenJianxing Date: Wed, 19 Feb 2020 15:32:01 +0800 Subject: [PATCH] (S2) WiFi: add ant field for esp32s2 and update phy lib from v102 to v202 --- components/esp_wifi/include/esp_wifi_types.h | 8 +++----- components/esp_wifi/lib | 2 +- components/esp_wifi/src/phy_init.c | 5 ----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index b79fe49419..6d6f9c8e10 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -333,14 +333,12 @@ typedef struct { unsigned secondary_channel:4; /**< secondary channel on which this packet is received. 0: none; 1: above; 2: below */ unsigned :8; /**< reserved */ unsigned timestamp:32; /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */ -#if CONFIG_IDF_TARGET_ESP32 - unsigned :32; /**< reserved */ - unsigned :31; /**< reserved */ - unsigned ant:1; /**< antenna number from which this packet is received. 0: WiFi antenna 0; 1: WiFi antenna 1 */ -#elif CONFIG_IDF_TARGET_ESP32S2 unsigned :32; /**< reserved */ +#if CONFIG_IDF_TARGET_ESP32S2 unsigned :32; /**< reserved */ #endif + unsigned :31; /**< reserved */ + unsigned ant:1; /**< antenna number from which this packet is received. 0: WiFi antenna 0; 1: WiFi antenna 1 */ #if CONFIG_IDF_TARGET_ESP32S2 signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: 0.25dBm*/ unsigned :24; /**< reserved */ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 16aec3da86..59f2ff048a 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 16aec3da866314d37781caa597b7d4bc19079fbc +Subproject commit 59f2ff048a2f7f6b9fd75df8c40fb51363656516 diff --git a/components/esp_wifi/src/phy_init.c b/components/esp_wifi/src/phy_init.c index 3fe54633cc..452fe97a97 100644 --- a/components/esp_wifi/src/phy_init.c +++ b/components/esp_wifi/src/phy_init.c @@ -765,8 +765,3 @@ void esp_phy_load_cal_and_init(phy_rf_module_t module) free(cal_data); // PHY maintains a copy of calibration data, so we can free this } -#if CONFIG_IDF_TARGET_ESP32S2 -/* Just a stub to avoid SSC build failure. Need to update phylib */ -void set_cca(bool en ,uint8_t cca_thr) {} -#endif -