blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/fix_multicast_example_map_wrong_address_issue_5.0' into 'release/v5.0'

Browse Source 
Lwip:Backport some lwip bugs to 5.0

See merge request espressif/esp-idf!24193
This commit is contained in:
Jiang Jiang Jian 2023-06-13 20:18:43 +08:00
commit d20884cecb
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ const esp_phy_init_data_t* esp_phy_get_init_data(void);
void esp_phy_release_init_data(const esp_phy_init_data_t* data); void esp_phy_release_init_data(const esp_phy_init_data_t* data);
/** /**
* @brief Function called by esp_phy_init to load PHY calibration data * @brief Function called by esp_phy_load_cal_and_init to load PHY calibration data
* *
* This is a convenience function which can be used to load PHY calibration * This is a convenience function which can be used to load PHY calibration
* data from NVS. Data can be stored to NVS using esp_phy_store_cal_data_to_nvs * data from NVS. Data can be stored to NVS using esp_phy_store_cal_data_to_nvs
@ -106,13 +106,6 @@ void esp_phy_release_init_data(const esp_phy_init_data_t* data);
* or obtained for a different version of software), this function will * or obtained for a different version of software), this function will
* return an error. * return an error.
* *
* If "Initialize PHY in startup code" option is set in menuconfig, this
* function will be used to load calibration data. To provide a different
* mechanism for loading calibration data, disable
* "Initialize PHY in startup code" option in menuconfig and call esp_phy_init
* function from the application. For an example usage of esp_phy_init and
* this function, see esp_phy_store_cal_data_to_nvs function in cpu_start.c
*
* @param out_cal_data pointer to calibration data structure to be filled with * @param out_cal_data pointer to calibration data structure to be filled with
* loaded data. * loaded data.
* @return ESP_OK on success * @return ESP_OK on success
@ -120,19 +113,13 @@ void esp_phy_release_init_data(const esp_phy_init_data_t* data);
esp_err_t esp_phy_load_cal_data_from_nvs(esp_phy_calibration_data_t* out_cal_data); esp_err_t esp_phy_load_cal_data_from_nvs(esp_phy_calibration_data_t* out_cal_data);
/** /**
* @brief Function called by esp_phy_init to store PHY calibration data * @brief Function called by esp_phy_load_cal_and_init to store PHY calibration data
* *
* This is a convenience function which can be used to store PHY calibration * This is a convenience function which can be used to store PHY calibration
* data to the NVS. Calibration data is returned by esp_phy_init function. * data to the NVS. Calibration data is returned by esp_phy_load_cal_and_init function.
* Data saved using this function to the NVS can later be loaded using * Data saved using this function to the NVS can later be loaded using
* esp_phy_store_cal_data_to_nvs function. * esp_phy_store_cal_data_to_nvs function.
* *
* If "Initialize PHY in startup code" option is set in menuconfig, this
* function will be used to store calibration data. To provide a different
* mechanism for storing calibration data, disable
* "Initialize PHY in startup code" option in menuconfig and call esp_phy_init
* function from the application.
*
* @param cal_data pointer to calibration data which has to be saved. * @param cal_data pointer to calibration data which has to be saved.
* @return ESP_OK on success * @return ESP_OK on success
*/ */

2
components/lwip/lwip

@ -1 +1 @@
Subproject commit d5e56d06658ae11292be1baea56204f7120b6fa7 Subproject commit 57c29648ff40e2a19a51683717928aaf766a0495