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

Merge branch 'feature/wifi_check_mac_when_cal_phy' into 'master'

Browse Source 
Added two functions in PHY API for disable interrupts and add rfcal data checking to PHY

See merge request !1840
This commit is contained in:
Jiang Jiang Jian
2018-01-25 20:27:55 +08:00
parent c73ea7a804 1bc87e972b
commit 62be35c0a5
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/lib

Submodule components/esp32/lib updated: 93e49810bc...b35fc86bbc

17
components/esp32/phy_init.c
View File

@@ -32,6 +32,8 @@
#include "nvs_flash.h"
#include "sdkconfig.h"
#include "freertos/FreeRTOS.h"
#include "freertos/portmacro.h"
#include "phy.h"
#include "phy_init_data.h"
#include "esp_coexist.h"
@@ -44,6 +46,16 @@ static int s_phy_rf_init_count = 0;
static _lock_t s_phy_rf_init_lock;
uint32_t phy_enter_critical(void)
{
return portENTER_CRITICAL_NESTED();
}
void phy_exit_critical(uint32_t level)
{
portEXIT_CRITICAL_NESTED(level);
}
esp_err_t esp_phy_rf_init(const esp_phy_init_data_t* init_data,
esp_phy_calibration_mode_t mode, esp_phy_calibration_data_t* calibration_data)
{
@@ -56,6 +68,11 @@ esp_err_t esp_phy_rf_init(const esp_phy_init_data_t* init_data,
ESP_LOGV(TAG, "register_chipv7_phy, init_data=%p, cal_data=%p, mode=%d",
init_data, calibration_data, mode);
phy_set_wifi_mode_only(0);
if (calibration_data != NULL) {
uint8_t mac[6];
esp_efuse_mac_get_default(mac);
memcpy(&calibration_data->opaque[4], mac, 6);
}
register_chipv7_phy(init_data, calibration_data, mode);
coex_bt_high_prio();
} else {