Skip to content

Commit 9c61080

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'feat/support_esp32c2_eco4_wifi_v53' into 'release/v5.3'
Feat/support esp32c2 eco4 wifi v53 See merge request espressif/esp-idf!34109
2 parents 5510aa6 + 21f893b commit 9c61080

File tree

5 files changed

+37
-18
lines changed

5 files changed

+37
-18
lines changed

components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,16 +1129,16 @@ lmacAdjustTimestamp = 0x40001b10;
11291129
lmacDiscardMSDU = 0x40001b18;
11301130
lmacEndFrameExchangeSequence = 0x40001b1c;
11311131
lmacMSDUAged = 0x40001b28;
1132-
lmacSetTxFrame = 0x40001b4c;
1132+
//lmacSetTxFrame = 0x40001b4c;
11331133
pm_check_state = 0x40001b6c;
11341134
pm_dream = 0x40001b78;
11351135
pm_on_beacon_rx = 0x40001ba0;
1136-
pm_parse_beacon = 0x40001bac;
1136+
//pm_parse_beacon = 0x40001bac;
11371137
pm_process_tim = 0x40001bb0;
11381138
pm_rx_beacon_process = 0x40001bb4;
11391139
pm_rx_data_process = 0x40001bb8;
11401140
pm_sleep = 0x40001bbc;
1141-
pm_tbtt_process = 0x40001bc4;
1141+
//pm_tbtt_process = 0x40001bc4;
11421142
ppAssembleAMPDU = 0x40001bcc;
11431143
ppCalTxAMPDULength = 0x40001bd8;
11441144
ppRxFragmentProc = 0x40001c28;
@@ -1148,7 +1148,7 @@ rcGetSched = 0x40001c88;
11481148
rcTxUpdatePer = 0x40001c94;
11491149
rcUpdateRate = 0x40001c9c;
11501150
wDev_AppendRxBlocks = 0x40001cdc;
1151-
wDev_IndicateFrame = 0x40001cec;
1151+
//wDev_IndicateFrame = 0x40001cec;
11521152
wDev_ProcessFiq = 0x40001d08;
11531153
wDev_ProcessRxSucData = 0x40001d0c;
11541154
ppProcTxDone = 0x40001d1c;
@@ -1170,10 +1170,10 @@ hal_crypto_set_key_entry = 0x40001e18;
11701170
pm_start = 0x40001e34;
11711171
pm_stop = 0x40001e38;
11721172
hal_set_sta_tbtt = 0x40001e4c;
1173-
pm_update_next_tbtt = 0x40001e50;
1173+
//pm_update_next_tbtt = 0x40001e50;
11741174
pm_set_sleep_type = 0x40001e54;
11751175
pm_tx_null_data_done_process = 0x40001eb0;
1176-
pm_tx_data_process = 0x40001eb4;
1176+
//pm_tx_data_process = 0x40001eb4;
11771177
pm_attach = 0x40001eb8;
11781178
pm_coex_schm_process = 0x40001ebc;
11791179
pm_on_probe_resp_rx = 0x40001ecc;
@@ -1196,39 +1196,39 @@ ieee80211_classify = 0x40001fe0;
11961196
ieee80211_crypto_decap = 0x40001ff8;
11971197
ieee80211_ccmp_decrypt = 0x4000200c;
11981198
ieee80211_ccmp_encrypt = 0x40002010;
1199-
ieee80211_send_action_vendor_spec = 0x40002034;
1199+
//ieee80211_send_action_vendor_spec = 0x40002034;
12001200
ieee80211_send_mgmt = 0x40002038;
1201-
ieee80211_auth_construct = 0x4000203c;
1201+
//ieee80211_auth_construct = 0x4000203c;
12021202
ieee80211_deauth_construct = 0x40002040;
12031203
ieee80211_disassoc_construct = 0x40002044;
12041204
ieee80211_add_xrates = 0x40002058;
1205-
ieee80211_assoc_req_construct = 0x40002060;
1205+
//ieee80211_assoc_req_construct = 0x40002060;
12061206
ieee80211_assoc_resp_construct = 0x40002064;
12071207
ieee80211_timer_process = 0x4000208c;
12081208
cnx_coexist_timeout = 0x40002090;
1209-
sta_recv_mgmt = 0x40002094;
1209+
//sta_recv_mgmt = 0x40002094;
12101210
ieee80211_send_probereq = 0x4000209c;
1211-
sta_auth_open = 0x400020a0;
1212-
sta_auth_sae = 0x400020a8;
1211+
//sta_auth_open = 0x400020a0;
1212+
//sta_auth_sae = 0x400020a8;
12131213
cnx_coexist_timeout_process = 0x400020ac;
12141214
ieee80211_add_extcap = 0x400020cc;
1215-
ieee80211_alloc_proberesp = 0x400020d8;
1215+
//ieee80211_alloc_proberesp = 0x400020d8;
12161216
esp_wifi_80211_tx = 0x400020f8;
12171217
ieee80211_crypto_aes_128_cmac_decrypt = 0x40002104;
12181218
ieee80211_output_do = 0x4000210c;
12191219
ieee80211_send_nulldata = 0x40002110;
1220-
ieee80211_setup_robust_mgmtframe = 0x40002114;
1221-
ieee80211_mgmt_output = 0x40002118;
1220+
//ieee80211_setup_robust_mgmtframe = 0x40002114;
1221+
//ieee80211_mgmt_output = 0x40002118;
12221222
ieee80211_send_deauth = 0x40002120;
1223-
ieee80211_tx_mgt_cb = 0x4000212c;
1223+
//ieee80211_tx_mgt_cb = 0x4000212c;
12241224
sta_rx_csa = 0x40002134;
12251225
sta_send_sa_query_req = 0x40002138;
12261226
sta_send_sa_query_resp = 0x4000213c;
12271227
sta_recv_sa_query_req = 0x40002140;
12281228
sta_recv_sa_query_resp = 0x40002144;
12291229
ieee80211_parse_beacon = 0x40002148;
12301230
ieee80211_match_security = 0x40002154;
1231-
ieee80211_parse_rsn = 0x4000215c;
1231+
//ieee80211_parse_rsn = 0x4000215c;
12321232
/* Data (.data, .bss, .rodata) */
12331233
s_sa_query_retries = 0x3fcdfad8;
12341234
s_sa_query_success = 0x3fcdfad5;

components/esp_wifi/include/esp_wifi_types_generic.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,7 @@ typedef enum {
805805
WIFI_EVENT_STA_BEACON_TIMEOUT, /**< Station beacon timeout */
806806

807807
WIFI_EVENT_CONNECTIONLESS_MODULE_WAKE_INTERVAL_START, /**< Connectionless module wake interval start */
808+
/* Add next events after this only */
808809

809810
WIFI_EVENT_AP_WPS_RG_SUCCESS, /**< Soft-AP wps succeeds in registrar mode */
810811
WIFI_EVENT_AP_WPS_RG_FAILED, /**< Soft-AP wps fails in registrar mode */

components/esp_wifi/src/wifi_init.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,3 +588,19 @@ void nan_sm_handle_event(void *p1, int p2)
588588
}
589589

590590
#endif
591+
592+
#if CONFIG_IDF_TARGET_ESP32C2
593+
#if CONFIG_ESP32C2_REV_MIN_FULL < 200
594+
void esp32c2_eco4_rom_ptr_init(void)
595+
{
596+
/* Do not remove, stub to overwrite weak link in Wi-Fi Lib */
597+
}
598+
#endif
599+
#endif
600+
601+
#ifndef CONFIG_ESP_WIFI_SLP_SAMPLE_BEACON_FEATURE
602+
void pm_beacon_offset_funcs_init(void)
603+
{
604+
/* Do not remove, stub to overwrite weak link in Wi-Fi Lib */
605+
}
606+
#endif

components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ typedef enum {
5757
} wifi_appie_ram_t;
5858

5959
enum {
60+
/* this enum is in C2 ROM, do not change before WPA3_AUTH_PSK_EXT_KEY */
6061
NONE_AUTH = 0x01,
6162
WPA_AUTH_UNSPEC = 0x02,
6263
WPA_AUTH_PSK = 0x03,
@@ -73,6 +74,7 @@ enum {
7374
WPA2_AUTH_FT_PSK = 0x0e,
7475
WPA3_AUTH_OWE = 0x0f,
7576
WPA3_AUTH_PSK_EXT_KEY = 0x10,
77+
/* this enum is in C2 ROM, do not change before WPA3_AUTH_PSK_EXT_KEY */
7678
WPA3_AUTH_DPP = 0x11,
7779
WPA2_AUTH_INVALID
7880
};

0 commit comments

Comments
 (0)