diff --git a/components/esp_wifi/esp32c3/include/phy_init_data.h b/components/esp_wifi/esp32c3/include/phy_init_data.h index 774be4e48c..bc5d1edd2a 100644 --- a/components/esp_wifi/esp32c3/include/phy_init_data.h +++ b/components/esp_wifi/esp32c3/include/phy_init_data.h @@ -38,78 +38,82 @@ extern "C" { #define PHY_SUPPORT_MULTIPLE_BIN_OFFSET 125 #endif -static const char phy_init_magic_pre[] = PHY_INIT_MAGIC; +static const char __attribute__((section(".rodata"))) phy_init_magic_pre[] = PHY_INIT_MAGIC; /** * @brief Structure containing default recommended PHY initialization parameters. */ static const esp_phy_init_data_t phy_init_data= { { - 3, - 3, - 0x05, - 0x09, - 0x06, - 0x05, - 0x03, - 0x06, - 0x05, - 0x04, - 0x06, - 0x04, - 0x05, + 0x00, + 0x00, + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x44), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4a), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46), + LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x42), 0x00, 0x00, 0x00, - 0x00, - 0x05, - 0x09, - 0x06, - 0x05, - 0x03, - 0x06, - 0x05, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xfc, - 0xfc, - 0xfe, - 0xf0, - 0xf0, - 0xf0, - 0xe0, - 0xe0, - 0xe0, - 0x18, - 0x18, - 0x18, - LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 84), - LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 72), - LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 66), - LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 60), - LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 56), - LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52), - 0, - 1, - 1, - 2, - 2, - 3, - 4, - 5, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, 0, 0, 0, @@ -151,9 +155,10 @@ static const esp_phy_init_data_t phy_init_data= { { 0, 0, 0, + 0x74 } }; -static const char phy_init_magic_post[] = PHY_INIT_MAGIC; +static const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC; #if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN /** diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 9bbfe53fed..0c2939b21a 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 9bbfe53fed066db3abfaca6bb903dee2fa4cb886 +Subproject commit 0c2939b21a816e7f28403a9e69cd257d12817260