espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/disable_tsf_tbtt_soc_wakeup_after_wifi_disconnected_v5.1' into 'release/v5.1'

Browse Source 
fix(wifi):  fix enable psram wapi dhcp fail issue, fix beacon timeout after connected, fix lightsleep failure after disconnected

See merge request espressif/esp-idf!26400
This commit is contained in:
Jiang Jiang Jian
2023-10-17 14:29:41 +08:00
parent 6d33f7af81 21360b9ef3
commit 78ae4c3b8e
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -1873,7 +1873,7 @@ ieee80211_ampdu_start_age_timer = 0x40001fb4;
ieee80211_encap_esfbuf = 0x40001fb8; ieee80211_encap_esfbuf = 0x40001fb8;
ieee80211_is_tx_allowed = 0x40001fbc; ieee80211_is_tx_allowed = 0x40001fbc;
ieee80211_output_pending_eb = 0x40001fc0; ieee80211_output_pending_eb = 0x40001fc0;
ieee80211_output_process = 0x40001fc4; /* ieee80211_output_process = 0x40001fc4; */
ieee80211_set_tx_desc = 0x40001fc8; ieee80211_set_tx_desc = 0x40001fc8;
/*sta_input = 0x40001fcc;*/ /*sta_input = 0x40001fcc;*/
wifi_get_macaddr = 0x40001fd0; wifi_get_macaddr = 0x40001fd0;
@ -1944,7 +1944,7 @@ ieee80211_output_raw_process = 0x400020f4;
ieee80211_raw_frame_sanity_check = 0x400020fc; ieee80211_raw_frame_sanity_check = 0x400020fc;
ieee80211_crypto_aes_128_cmac_encrypt = 0x40002100; ieee80211_crypto_aes_128_cmac_encrypt = 0x40002100;
ieee80211_alloc_tx_buf = 0x40002108; ieee80211_alloc_tx_buf = 0x40002108;
ieee80211_output_do = 0x4000210c; /* ieee80211_output_do = 0x4000210c; */
/* ieee80211_send_nulldata = 0x40002110; */ /* ieee80211_send_nulldata = 0x40002110; */
ieee80211_setup_robust_mgmtframe = 0x40002114; ieee80211_setup_robust_mgmtframe = 0x40002114;
ieee80211_encap_null_data = 0x4000211c; ieee80211_encap_null_data = 0x4000211c;

2
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@ -1802,7 +1802,7 @@ ieee80211_ampdu_start_age_timer = 0x40001858;
/*ieee80211_encap_esfbuf = 0x4000185c;*/ /*ieee80211_encap_esfbuf = 0x4000185c;*/
ieee80211_is_tx_allowed = 0x40001860; ieee80211_is_tx_allowed = 0x40001860;
ieee80211_output_pending_eb = 0x40001864; ieee80211_output_pending_eb = 0x40001864;
ieee80211_output_process = 0x40001868; /*ieee80211_output_process = 0x40001868;*/
ieee80211_set_tx_desc = 0x4000186c; ieee80211_set_tx_desc = 0x4000186c;
rom_sta_input = 0x40001870; rom_sta_input = 0x40001870;
wifi_get_macaddr = 0x40001874; wifi_get_macaddr = 0x40001874;

2
components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
View File

@ -36,7 +36,7 @@ ieee80211_ampdu_start_age_timer = 0x40000b84;
ieee80211_encap_esfbuf = 0x40000b88; ieee80211_encap_esfbuf = 0x40000b88;
ieee80211_is_tx_allowed = 0x40000b8c; ieee80211_is_tx_allowed = 0x40000b8c;
ieee80211_output_pending_eb = 0x40000b90; ieee80211_output_pending_eb = 0x40000b90;
ieee80211_output_process = 0x40000b94; /*ieee80211_output_process = 0x40000b94;*/
ieee80211_set_tx_desc = 0x40000b98; ieee80211_set_tx_desc = 0x40000b98;
//sta_input = 0x40000b9c; //sta_input = 0x40000b9c;
wifi_get_macaddr = 0x40000ba0; wifi_get_macaddr = 0x40000ba0;

2
components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
View File

@ -144,7 +144,7 @@ TRC_PER_IS_GOOD = 0x40000dc0;
trc_SetTxAmpduState = 0x40000dc4; trc_SetTxAmpduState = 0x40000dc4;
trc_tid_isTxAmpduOperational = 0x40000dc8; trc_tid_isTxAmpduOperational = 0x40000dc8;
trcAmpduSetState = 0x40000dcc; trcAmpduSetState = 0x40000dcc;
wDevCheckBlockError = 0x40000dd0; //wDevCheckBlockError = 0x40000dd0;
wDev_AppendRxBlocks = 0x40000dd4; wDev_AppendRxBlocks = 0x40000dd4;
wDev_DiscardFrame = 0x40000dd8; wDev_DiscardFrame = 0x40000dd8;
wDev_GetNoiseFloor = 0x40000ddc; wDev_GetNoiseFloor = 0x40000ddc;

2
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@ -2119,7 +2119,7 @@ ieee80211_ampdu_start_age_timer = 0x40005a60;
/* ieee80211_encap_esfbuf = 0x40005a6c; */ /* ieee80211_encap_esfbuf = 0x40005a6c; */
ieee80211_is_tx_allowed = 0x40005a78; ieee80211_is_tx_allowed = 0x40005a78;
ieee80211_output_pending_eb = 0x40005a84; ieee80211_output_pending_eb = 0x40005a84;
ieee80211_output_process = 0x40005a90; /*ieee80211_output_process = 0x40005a90;*/
ieee80211_set_tx_desc = 0x40005a9c; ieee80211_set_tx_desc = 0x40005a9c;
/*sta_input = 0x40005aa8;*/ /*sta_input = 0x40005aa8;*/
wifi_get_macaddr = 0x40005ab4; wifi_get_macaddr = 0x40005ab4;

4
components/esp_wifi/include/esp_wifi.h
View File

@ -447,7 +447,7 @@ esp_err_t esp_wifi_scan_stop(void);
/** /**
* @brief Get number of APs found in last scan * @brief Get number of APs found in last scan
* *
* @param[out] number store number of APIs found in last scan * @param[out] number store number of APs found in last scan
* *
* @attention This API can only be called when the scan is completed, otherwise it may get wrong value. * @attention This API can only be called when the scan is completed, otherwise it may get wrong value.
* *
@ -829,7 +829,7 @@ esp_err_t esp_wifi_get_promiscuous_ctrl_filter(wifi_promiscuous_filter_t *filter
* - ESP_ERR_WIFI_MODE: invalid mode * - ESP_ERR_WIFI_MODE: invalid mode
* - ESP_ERR_WIFI_PASSWORD: invalid password * - ESP_ERR_WIFI_PASSWORD: invalid password
* - ESP_ERR_WIFI_NVS: WiFi internal NVS error * - ESP_ERR_WIFI_NVS: WiFi internal NVS error
* - others: refer to the erro code in esp_err.h * - others: refer to the error code in esp_err.h
*/ */
esp_err_t esp_wifi_set_config(wifi_interface_t interface, wifi_config_t *conf); esp_err_t esp_wifi_set_config(wifi_interface_t interface, wifi_config_t *conf);

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 174341fbe1...983a779766

8
components/protocomm/test_apps/main/test_protocomm.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -234,7 +234,7 @@ static esp_err_t prepare_command1(session_t *session, SessionData *req)
ret = mbedtls_aes_setkey_enc(&session->ctx_aes, session->sym_key, ret = mbedtls_aes_setkey_enc(&session->ctx_aes, session->sym_key,
sizeof(session->sym_key)*8); sizeof(session->sym_key)*8);
if (ret != 0) { if (ret != 0) {
ESP_LOGE(TAG, "Failed at mbedtls_aes_setkey_enc with erro code : %d", ret); ESP_LOGE(TAG, "Failed at mbedtls_aes_setkey_enc with error code : %d", ret);
free(outbuf); free(outbuf);
return ESP_FAIL; return ESP_FAIL;
} }
@ -243,7 +243,7 @@ static esp_err_t prepare_command1(session_t *session, SessionData *req)
&session->nc_off, session->rand, &session->nc_off, session->rand,
session->stb, session->device_pubkey, outbuf); session->stb, session->device_pubkey, outbuf);
if (ret != 0) { if (ret != 0) {
ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with erro code : %d", ret); ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with error code : %d", ret);
free(outbuf); free(outbuf);
return ESP_FAIL; return ESP_FAIL;
} }
@ -308,7 +308,7 @@ static esp_err_t verify_response1(session_t *session, SessionData *resp)
&session->nc_off, session->rand, session->stb, &session->nc_off, session->rand, session->stb,
in->sr1->device_verify_data.data, check_buf); in->sr1->device_verify_data.data, check_buf);
if (ret != 0) { if (ret != 0) {
ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with erro code : %d", ret); ESP_LOGE(TAG, "Failed at mbedtls_aes_crypt_ctr with error code : %d", ret);
return ESP_FAIL; return ESP_FAIL;
} }
hexdump("Dec Device verifier", check_buf, sizeof(check_buf)); hexdump("Dec Device verifier", check_buf, sizeof(check_buf));