Skip to content

Commit

Permalink
Merge branch 'feat/support_esp32c3_v1.1_wifi_v5.1' into 'release/v5.1'
Browse files Browse the repository at this point in the history 
feat(wifi): support esp32c3 v1.1 WiFi(v5.1)

See merge request espressif/esp-idf!27914
  • Loading branch information
@jack0c
jack0c committed Dec 28, 2023
2 parents 47c8944 + 58de97b commit 0489504
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 28 deletions.
18 changes: 9 additions & 9 deletions components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View file
Expand Up @@ -1483,13 +1483,13 @@ ic_get_trc = 0x40001afc;
ic_mac_init = 0x40001b04;
ic_interface_enabled = 0x40001b08;
is_lmac_idle = 0x40001b0c;
lmacAdjustTimestamp = 0x40001b10;
/*lmacAdjustTimestamp = 0x40001b10;*/
lmacDiscardAgedMSDU = 0x40001b14;
/*lmacDiscardMSDU = 0x40001b18;*/
lmacEndFrameExchangeSequence = 0x40001b1c;
lmacIsIdle = 0x40001b20;
lmacIsLongFrame = 0x40001b24;
lmacMSDUAged = 0x40001b28;
/*lmacMSDUAged = 0x40001b28;*/
lmacPostTxComplete = 0x40001b2c;
lmacProcessAllTxTimeout = 0x40001b30;
lmacProcessCollisions = 0x40001b34;
Expand All @@ -1506,7 +1506,7 @@ mac_tx_set_htsig = 0x40001b5c;
mac_tx_set_plcp0 = 0x40001b60;
mac_tx_set_plcp1 = 0x40001b64;
mac_tx_set_plcp2 = 0x40001b68;
pm_check_state = 0x40001b6c;
/* pm_check_state = 0x40001b6c; */
pm_disable_dream_timer = 0x40001b70;
pm_disable_sleep_delay_timer = 0x40001b74;
pm_dream = 0x40001b78;
Expand Down Expand Up @@ -1617,7 +1617,7 @@ ppDequeueTxDone_Locked = 0x40001d18;
/*ppProcTxDone = 0x40001d1c;*/
/*pm_tx_data_done_process = 0x40001d20;*/
config_is_cache_tx_buf_enabled = 0x40001d24;
ppMapWaitTxq = 0x40001d28;
//ppMapWaitTxq = 0x40001d28;
ppProcessWaitingQueue = 0x40001d2c;
ppDisableQueue = 0x40001d30;
pm_allow_tx = 0x40001d34;
Expand Down Expand Up @@ -1715,14 +1715,14 @@ pp_timer_do_process = 0x40001ea0;
rcUpdateAMPDUParam = 0x40001ea4;
rcUpdatePhyMode = 0x40001ea8;
rcGetHighestRateIdx = 0x40001eac;
pm_tx_null_data_done_process = 0x40001eb0;
pm_tx_data_process = 0x40001eb4;
//pm_tx_null_data_done_process = 0x40001eb0;
//pm_tx_data_process = 0x40001eb4;
/* pm_attach = 0x40001eb8; */
/* pm_coex_schm_process = 0x40001ebc; */
ppInitTxq = 0x40001ec0;
pp_attach = 0x40001ec4;
pp_deattach = 0x40001ec8;
pm_on_probe_resp_rx = 0x40001ecc;
//pm_on_probe_resp_rx = 0x40001ecc;
hal_set_sta_tsf = 0x40001ed0;
ic_update_sta_tsf = 0x40001ed4;
ic_tx_pkt = 0x40001ed8;
Expand Down Expand Up @@ -1866,7 +1866,7 @@ ieee80211_recycle_cache_eb = 0x40001fe8;
ieee80211_search_node = 0x40001fec;
roundup2 = 0x40001ff0;
ieee80211_crypto_encap = 0x40001ff4;
ieee80211_crypto_decap = 0x40001ff8;
/* ieee80211_crypto_decap = 0x40001ff8; */
ieee80211_decap = 0x40001ffc;
ieee80211_set_tx_pti = 0x40002000;
wifi_is_started = 0x40002004;
Expand Down Expand Up @@ -1901,7 +1901,7 @@ wifi_get_init_state = 0x40002088;
/* cnx_coexist_timeout = 0x40002090; */
/* sta_recv_mgmt = 0x40002094;*/
ieee80211_send_setup = 0x40002098;
ieee80211_send_probereq = 0x4000209c;
//ieee80211_send_probereq = 0x4000209c;
sta_auth_shared = 0x400020a4;
/* cnx_coexist_timeout_process = 0x400020ac; */
ieee80211_alloc_challenge = 0x400020b0;
Expand Down
10 changes: 6 additions & 4 deletions components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
View file
Expand Up @@ -9,13 +9,14 @@ esf_buf_recycle = 0x400015c4;
hal_mac_tx_set_ppdu = 0x400015d4;
ic_mac_deinit = 0x400015dc;
lmacDiscardMSDU = 0x400015f4;
lmacSetTxFrame = 0x40001628;
/*lmacSetTxFrame = 0x40001628;*/
lmacTxDone = 0x4000162c;
lmacTxFrame = 0x40001630;
mac_tx_set_htsig = 0x40001638;
mac_tx_set_plcp1 = 0x40001640;
pm_check_state = 0x40001648;
pm_on_beacon_rx = 0x4000167c;
pm_parse_beacon = 0x40001688;
/*pm_parse_beacon = 0x40001688;*/
pm_process_tim = 0x4000168c;
pm_rx_beacon_process = 0x40001690;
pm_rx_data_process = 0x40001694;
Expand All @@ -28,11 +29,12 @@ ppProcTxSecFrame = 0x400016dc;
rcTxUpdatePer = 0x40001770;
rcUpdateTxDone = 0x4000177c;
wDevCheckBlockError = 0x400017b4;
wDev_IndicateFrame = 0x400017c8;
/* wDev_IndicateFrame = 0x400017c8;*/
wDev_ProcessFiq = 0x400017f0;
wDev_ProcessRxSucData = 0x400017f4;
ppProcTxDone = 0x40001804;
/*ppProcTxDone = 0x40001804;*/
pm_tx_data_done_process = 0x40001808;
ppMapWaitTxq = 0x40001810;
ieee80211_encap_esfbuf = 0x4000185c;
sta_input = 0x40001870;
ieee80211_crypto_decap = 0x4000189c;
Expand Down
8 changes: 4 additions & 4 deletions components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View file
Expand Up @@ -1513,13 +1513,13 @@ ic_get_trc = 0x400015d8;
ic_mac_init = 0x400015e0;
ic_interface_enabled = 0x400015e4;
is_lmac_idle = 0x400015e8;
lmacAdjustTimestamp = 0x400015ec;
/*lmacAdjustTimestamp = 0x400015ec;*/
lmacDiscardAgedMSDU = 0x400015f0;
/*lmacDiscardMSDU = 0x400015f4;*/
lmacEndFrameExchangeSequence = 0x400015f8;
lmacIsIdle = 0x400015fc;
lmacIsLongFrame = 0x40001600;
lmacMSDUAged = 0x40001604;
/*lmacMSDUAged = 0x40001604;*/
lmacPostTxComplete = 0x40001608;
lmacProcessAllTxTimeout = 0x4000160c;
lmacProcessCollisions = 0x40001610;
Expand All @@ -1535,7 +1535,7 @@ mac_tx_set_duration = 0x40001634;
mac_tx_set_plcp0 = 0x4000163c;
/* mac_tx_set_plcp1 = 0x40001640;*/
mac_tx_set_plcp2 = 0x40001644;
pm_check_state = 0x40001648;
/* pm_check_state = 0x40001648; */
pm_disable_dream_timer = 0x4000164c;
pm_disable_sleep_delay_timer = 0x40001650;
pm_dream = 0x40001654;
Expand Down Expand Up @@ -1644,7 +1644,7 @@ wdev_csi_len_align = 0x400017fc;
ppDequeueTxDone_Locked = 0x40001800;
/*pm_tx_data_done_process = 0x40001808;*/
config_is_cache_tx_buf_enabled = 0x4000180c;
ppMapWaitTxq = 0x40001810;
//ppMapWaitTxq = 0x40001810;
ppProcessWaitingQueue = 0x40001814;
ppDisableQueue = 0x40001818;
pm_allow_tx = 0x4000181c;
Expand Down
2 changes: 1 addition & 1 deletion components/esp_rom/esp32c6/ld/esp32c6.rom.net80211.ld
View file
Expand Up @@ -48,7 +48,7 @@ ieee80211_copy_eb_header = 0x40000bb4;
ieee80211_recycle_cache_eb = 0x40000bb8;
ieee80211_search_node = 0x40000bbc;
ieee80211_crypto_encap = 0x40000bc0;
ieee80211_crypto_decap = 0x40000bc4;
/* ieee80211_crypto_decap = 0x40000bc4; */
ieee80211_decap = 0x40000bc8;
wifi_is_started = 0x40000bcc;
ieee80211_gettid = 0x40000bd0;
Expand Down
8 changes: 4 additions & 4 deletions components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
View file
Expand Up @@ -34,13 +34,13 @@ ic_get_trc = 0x40000c04;
ic_mac_init = 0x40000c0c;
ic_interface_enabled = 0x40000c10;
is_lmac_idle = 0x40000c14;
lmacAdjustTimestamp = 0x40000c18;
/*lmacAdjustTimestamp = 0x40000c18;*/
lmacDiscardAgedMSDU = 0x40000c1c;
/*lmacDiscardMSDU = 0x40000c20;*/
lmacEndFrameExchangeSequence = 0x40000c24;
lmacIsIdle = 0x40000c28;
lmacIsLongFrame = 0x40000c2c;
lmacMSDUAged = 0x40000c30;
/*lmacMSDUAged = 0x40000c30;*/
lmacPostTxComplete = 0x40000c34;
lmacProcessAllTxTimeout = 0x40000c38;
lmacProcessCollisions = 0x40000c3c;
Expand All @@ -56,7 +56,7 @@ mac_tx_set_duration = 0x40000c60;
//mac_tx_set_plcp0 = 0x40000c64;
//mac_tx_set_plcp1 = 0x40000c68;
mac_tx_set_plcp2 = 0x40000c6c;
pm_check_state = 0x40000c70;
/* pm_check_state = 0x40000c70; */
/* pm_disable_dream_timer = 0x40000c74; */
pm_disable_sleep_delay_timer = 0x40000c78;
pm_dream = 0x40000c7c;
Expand Down Expand Up @@ -165,7 +165,7 @@ ppDequeueTxDone_Locked = 0x40000e14;
//ppProcTxDone = 0x40000e18;
//pm_tx_data_done_process = 0x40000e1c;
config_is_cache_tx_buf_enabled = 0x40000e20;
ppMapWaitTxq = 0x40000e24;
//ppMapWaitTxq = 0x40000e24;
ppProcessWaitingQueue = 0x40000e28;
ppDisableQueue = 0x40000e2c;
pm_allow_tx = 0x40000e30;
Expand Down
8 changes: 4 additions & 4 deletions components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View file
Expand Up @@ -1814,13 +1814,13 @@ ic_get_trc = 0x400052c8;
ic_mac_init = 0x400052e0;
ic_interface_enabled = 0x400052ec;
is_lmac_idle = 0x400052f8;
lmacAdjustTimestamp = 0x40005304;
/*lmacAdjustTimestamp = 0x40005304;*/
lmacDiscardAgedMSDU = 0x40005310;
/*lmacDiscardMSDU = 0x4000531c;*/
lmacEndFrameExchangeSequence = 0x40005328;
lmacIsIdle = 0x40005334;
lmacIsLongFrame = 0x40005340;
lmacMSDUAged = 0x4000534c;
/*lmacMSDUAged = 0x4000534c;*/
lmacPostTxComplete = 0x40005358;
lmacProcessAllTxTimeout = 0x40005364;
lmacProcessCollisions = 0x40005370;
Expand All @@ -1837,7 +1837,7 @@ mac_tx_set_duration = 0x400053dc;
mac_tx_set_plcp0 = 0x400053f4;
/* mac_tx_set_plcp1 = 0x40005400;*/
mac_tx_set_plcp2 = 0x4000540c;
pm_check_state = 0x40005418;
/* pm_check_state = 0x40005418; */
pm_disable_dream_timer = 0x40005424;
pm_disable_sleep_delay_timer = 0x40005430;
pm_dream = 0x4000543c;
Expand Down Expand Up @@ -1950,7 +1950,7 @@ ppDequeueTxDone_Locked = 0x40005940;
/*ppProcTxDone = 0x4000594c;*/
/*pm_tx_data_done_process = 0x40005958;*/
config_is_cache_tx_buf_enabled = 0x40005964;
ppMapWaitTxq = 0x40005970;
//ppMapWaitTxq = 0x40005970;
ppProcessWaitingQueue = 0x4000597c;
ppDisableQueue = 0x40005988;
pm_allow_tx = 0x40005994;
Expand Down
2 changes: 1 addition & 1 deletion components/esp_wifi/lib
Submodule lib updated 40 files
+ − esp32/libcore.a
+ − esp32/libespnow.a
+ − esp32/libmesh.a
+ − esp32/libnet80211.a
+ − esp32/libpp.a
+ − esp32/libsmartconfig.a
+ − esp32/libwapi.a
+ − esp32c2/libcore.a
+ − esp32c2/libespnow.a
+ − esp32c2/libnet80211.a
+ − esp32c2/libpp.a
+ − esp32c2/libsmartconfig.a
+ − esp32c3/libcore.a
+ − esp32c3/libespnow.a
+ − esp32c3/libmesh.a
+ − esp32c3/libnet80211.a
+ − esp32c3/libpp.a
+ − esp32c3/libsmartconfig.a
+ − esp32c3/libwapi.a
+ − esp32c6/libcore.a
+ − esp32c6/libespnow.a
+ − esp32c6/libmesh.a
+ − esp32c6/libnet80211.a
+ − esp32c6/libpp.a
+ − esp32c6/libsmartconfig.a
+ − esp32c6/libwapi.a
+ − esp32s2/libcore.a
+ − esp32s2/libespnow.a
+ − esp32s2/libmesh.a
+ − esp32s2/libnet80211.a
+ − esp32s2/libpp.a
+ − esp32s2/libsmartconfig.a
+ − esp32s2/libwapi.a
+ − esp32s3/libcore.a
+ − esp32s3/libespnow.a
+ − esp32s3/libmesh.a
+ − esp32s3/libnet80211.a
+ − esp32s3/libpp.a
+ − esp32s3/libsmartconfig.a
+ − esp32s3/libwapi.a
2 changes: 1 addition & 1 deletion examples/wifi/iperf/sdkconfig.defaults.esp32
View file
Expand Up @@ -16,7 +16,7 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64

CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y

CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240

0 comments on commit 0489504

Please sign in to comment.