espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(phy): Update phy lib to master

Browse Source
This commit is contained in:
zhangyanjiao
2023-10-24 11:52:50 +08:00
parent 52ff4707d8
commit 49f02b3b43
8 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp_phy/include/esp_phy_init.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -245,6 +245,18 @@ esp_err_t esp_phy_apply_phy_init_data(uint8_t *init_data);
*/ */
char * get_phy_version_str(void); char * get_phy_version_str(void);
/**
* @brief Set PHY init parameters
* @param param is 1 means combo module
*/
void phy_init_param_set(uint8_t param);
/**
* @brief Wi-Fi RX enable
* @param enable Whether to enable phy for wifi
*/
void phy_wifi_enable_set(uint8_t enable);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
components/esp_phy/lib

Submodule components/esp_phy/lib updated: 086ac00e98...59c055bcdb

9
components/esp_phy/src/phy_init.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -691,6 +691,13 @@ void esp_phy_load_cal_and_init(void)
#if CONFIG_IDF_TARGET_ESP32S2 #if CONFIG_IDF_TARGET_ESP32S2
phy_eco_version_sel(efuse_hal_chip_revision() / 100); phy_eco_version_sel(efuse_hal_chip_revision() / 100);
#endif #endif
// Set PHY whether in combo module
// For comode mode, phy enable will be not in WiFi RX state
#if SOC_PHY_COMBO_MODULE
phy_init_param_set(0);
#endif
esp_phy_calibration_data_t* cal_data = esp_phy_calibration_data_t* cal_data =
(esp_phy_calibration_data_t*) calloc(sizeof(esp_phy_calibration_data_t), 1); (esp_phy_calibration_data_t*) calloc(sizeof(esp_phy_calibration_data_t), 1);
if (cal_data == NULL) { if (cal_data == NULL) {

18
components/esp_wifi/esp32/esp_adapter.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -730,6 +730,18 @@ int IRAM_ATTR coex_is_in_isr_wrapper(void)
return !xPortCanYield(); return !xPortCanYield();
} }
static void esp_phy_enable_wrapper(void)
{
esp_phy_enable();
phy_wifi_enable_set(1);
}
static void esp_phy_disable_wrapper(void)
{
phy_wifi_enable_set(0);
esp_phy_disable();
}
wifi_osi_funcs_t g_wifi_osi_funcs = { wifi_osi_funcs_t g_wifi_osi_funcs = {
._version = ESP_WIFI_OS_ADAPTER_VERSION, ._version = ESP_WIFI_OS_ADAPTER_VERSION,
._env_is_chip = env_is_chip_wrapper, ._env_is_chip = env_is_chip_wrapper,
@@ -783,8 +795,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._dport_access_stall_other_cpu_end_wrap = s_esp_dport_access_stall_other_cpu_end, ._dport_access_stall_other_cpu_end_wrap = s_esp_dport_access_stall_other_cpu_end,
._wifi_apb80m_request = wifi_apb80m_request_wrapper, ._wifi_apb80m_request = wifi_apb80m_request_wrapper,
._wifi_apb80m_release = wifi_apb80m_release_wrapper, ._wifi_apb80m_release = wifi_apb80m_release_wrapper,
._phy_disable = esp_phy_disable, ._phy_disable = esp_phy_disable_wrapper,
._phy_enable = esp_phy_enable, ._phy_enable = esp_phy_enable_wrapper,
._phy_common_clock_enable = esp_phy_common_clock_enable, ._phy_common_clock_enable = esp_phy_common_clock_enable,
._phy_common_clock_disable = esp_phy_common_clock_disable, ._phy_common_clock_disable = esp_phy_common_clock_disable,
._phy_update_country_info = esp_phy_update_country_info, ._phy_update_country_info = esp_phy_update_country_info,

18
components/esp_wifi/esp32c2/esp_adapter.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -651,6 +651,18 @@ static void IRAM_ATTR esp_empty_wrapper(void)
} }
static void esp_phy_enable_wrapper(void)
{
esp_phy_enable();
phy_wifi_enable_set(1);
}
static void esp_phy_disable_wrapper(void)
{
phy_wifi_enable_set(0);
esp_phy_disable();
}
wifi_osi_funcs_t g_wifi_osi_funcs = { wifi_osi_funcs_t g_wifi_osi_funcs = {
._version = ESP_WIFI_OS_ADAPTER_VERSION, ._version = ESP_WIFI_OS_ADAPTER_VERSION,
._env_is_chip = env_is_chip_wrapper, ._env_is_chip = env_is_chip_wrapper,
@@ -704,8 +716,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper, ._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper,
._wifi_apb80m_request = wifi_apb80m_request_wrapper, ._wifi_apb80m_request = wifi_apb80m_request_wrapper,
._wifi_apb80m_release = wifi_apb80m_release_wrapper, ._wifi_apb80m_release = wifi_apb80m_release_wrapper,
._phy_disable = esp_phy_disable, ._phy_disable = esp_phy_disable_wrapper,
._phy_enable = esp_phy_enable, ._phy_enable = esp_phy_enable_wrapper,
._phy_update_country_info = esp_phy_update_country_info, ._phy_update_country_info = esp_phy_update_country_info,
._read_mac = esp_read_mac_wrapper, ._read_mac = esp_read_mac_wrapper,
._timer_arm = timer_arm_wrapper, ._timer_arm = timer_arm_wrapper,

18
components/esp_wifi/esp32c3/esp_adapter.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -659,6 +659,18 @@ static void IRAM_ATTR esp_empty_wrapper(void)
} }
static void esp_phy_enable_wrapper(void)
{
esp_phy_enable();
phy_wifi_enable_set(1);
}
static void esp_phy_disable_wrapper(void)
{
phy_wifi_enable_set(0);
esp_phy_disable();
}
wifi_osi_funcs_t g_wifi_osi_funcs = { wifi_osi_funcs_t g_wifi_osi_funcs = {
._version = ESP_WIFI_OS_ADAPTER_VERSION, ._version = ESP_WIFI_OS_ADAPTER_VERSION,
._env_is_chip = env_is_chip_wrapper, ._env_is_chip = env_is_chip_wrapper,
@@ -712,8 +724,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper, ._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper,
._wifi_apb80m_request = wifi_apb80m_request_wrapper, ._wifi_apb80m_request = wifi_apb80m_request_wrapper,
._wifi_apb80m_release = wifi_apb80m_release_wrapper, ._wifi_apb80m_release = wifi_apb80m_release_wrapper,
._phy_disable = esp_phy_disable, ._phy_disable = esp_phy_disable_wrapper,
._phy_enable = esp_phy_enable, ._phy_enable = esp_phy_enable_wrapper,
._phy_update_country_info = esp_phy_update_country_info, ._phy_update_country_info = esp_phy_update_country_info,
._read_mac = esp_read_mac_wrapper, ._read_mac = esp_read_mac_wrapper,
._timer_arm = timer_arm_wrapper, ._timer_arm = timer_arm_wrapper,

16
components/esp_wifi/esp32s2/esp_adapter.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -731,6 +731,16 @@ int IRAM_ATTR coex_is_in_isr_wrapper(void)
return !xPortCanYield(); return !xPortCanYield();
} }
static void esp_phy_enable_wrapper(void)
{
esp_phy_enable();
}
static void esp_phy_disable_wrapper(void)
{
esp_phy_disable();
}
wifi_osi_funcs_t g_wifi_osi_funcs = { wifi_osi_funcs_t g_wifi_osi_funcs = {
._version = ESP_WIFI_OS_ADAPTER_VERSION, ._version = ESP_WIFI_OS_ADAPTER_VERSION,
._env_is_chip = env_is_chip_wrapper, ._env_is_chip = env_is_chip_wrapper,
@@ -784,8 +794,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper, ._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper,
._wifi_apb80m_request = wifi_apb80m_request_wrapper, ._wifi_apb80m_request = wifi_apb80m_request_wrapper,
._wifi_apb80m_release = wifi_apb80m_release_wrapper, ._wifi_apb80m_release = wifi_apb80m_release_wrapper,
._phy_disable = esp_phy_disable, ._phy_disable = esp_phy_disable_wrapper,
._phy_enable = esp_phy_enable, ._phy_enable = esp_phy_enable_wrapper,
._phy_common_clock_enable = esp_phy_common_clock_enable, ._phy_common_clock_enable = esp_phy_common_clock_enable,
._phy_common_clock_disable = esp_phy_common_clock_disable, ._phy_common_clock_disable = esp_phy_common_clock_disable,
._phy_update_country_info = esp_phy_update_country_info, ._phy_update_country_info = esp_phy_update_country_info,

18
components/esp_wifi/esp32s3/esp_adapter.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -753,6 +753,18 @@ int IRAM_ATTR coex_is_in_isr_wrapper(void)
return !xPortCanYield(); return !xPortCanYield();
} }
static void esp_phy_enable_wrapper(void)
{
esp_phy_enable();
phy_wifi_enable_set(1);
}
static void esp_phy_disable_wrapper(void)
{
phy_wifi_enable_set(0);
esp_phy_disable();
}
wifi_osi_funcs_t g_wifi_osi_funcs = { wifi_osi_funcs_t g_wifi_osi_funcs = {
._version = ESP_WIFI_OS_ADAPTER_VERSION, ._version = ESP_WIFI_OS_ADAPTER_VERSION,
._env_is_chip = env_is_chip_wrapper, ._env_is_chip = env_is_chip_wrapper,
@@ -806,8 +818,8 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper, ._dport_access_stall_other_cpu_end_wrap = esp_empty_wrapper,
._wifi_apb80m_request = wifi_apb80m_request_wrapper, ._wifi_apb80m_request = wifi_apb80m_request_wrapper,
._wifi_apb80m_release = wifi_apb80m_release_wrapper, ._wifi_apb80m_release = wifi_apb80m_release_wrapper,
._phy_disable = esp_phy_disable, ._phy_disable = esp_phy_disable_wrapper,
._phy_enable = esp_phy_enable, ._phy_enable = esp_phy_enable_wrapper,
._phy_update_country_info = esp_phy_update_country_info, ._phy_update_country_info = esp_phy_update_country_info,
._read_mac = esp_read_mac, ._read_mac = esp_read_mac,
._timer_arm = timer_arm_wrapper, ._timer_arm = timer_arm_wrapper,