espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-14 14:30:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/esp32s2beta_update

Browse Source
This commit is contained in:
Angus Gratton
2019-08-08 14:00:45 +10:00
committed by Angus Gratton
parent 24d26fccde 51d811a71c
commit 04ae56806c
657 changed files with 6814 additions and 7534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_wifi/src/phy_init.c
View File

@@ -390,7 +390,7 @@ esp_err_t esp_modem_sleep_deregister(modem_sleep_module_t module)
#if CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION
#include "esp_partition.h"
const esp_phy_init_data_t* esp_phy_get_init_data()
const esp_phy_init_data_t* esp_phy_get_init_data(void)
{
const esp_partition_t* partition = esp_partition_find_first(
ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_PHY, NULL);
@@ -430,7 +430,7 @@ void esp_phy_release_init_data(const esp_phy_init_data_t* init_data)
// phy_init_data.h will declare static 'phy_init_data' variable initialized with default init data
const esp_phy_init_data_t* esp_phy_get_init_data()
const esp_phy_init_data_t* esp_phy_get_init_data(void)
{
ESP_LOGD(TAG, "loading PHY init data from application binary");
return &phy_init_data;

4
components/esp_wifi/src/wifi_init.c
View File

@@ -41,7 +41,7 @@ wifi_mac_time_update_cb_t s_wifi_mac_time_update_cb = NULL;
static const char* TAG = "wifi_init";
static void __attribute__((constructor)) s_set_default_wifi_log_level()
static void __attribute__((constructor)) s_set_default_wifi_log_level(void)
{
/* WiFi libraries aren't compiled to know CONFIG_LOG_DEFAULT_LEVEL,
so set it at runtime startup. Done here not in esp_wifi_init() to allow
@@ -51,7 +51,7 @@ static void __attribute__((constructor)) s_set_default_wifi_log_level()
esp_log_level_set("mesh", CONFIG_LOG_DEFAULT_LEVEL);
}
static void esp_wifi_set_debug_log()
static void esp_wifi_set_debug_log(void)
{
/* set WiFi log level and module */
#if CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE