diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index f1a816d1e4..00ea485ddf 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -83,7 +83,7 @@ ppAMPDU2Normal = 0x40000ccc; ppAssembleAMPDU = 0x40000cd0; ppCalFrameTimes = 0x40000cd4; ppCalSubFrameLength = 0x40000cd8; -ppCalTxAMPDULength = 0x40000cdc; +//ppCalTxAMPDULength = 0x40000cdc; ppCheckTxAMPDUlength = 0x40000ce0; ppDequeueRxq_Locked = 0x40000ce4; ppDequeueTxQ = 0x40000ce8; @@ -184,7 +184,7 @@ lmacProcessTBSuccess = 0x40000e60; lmacProcessTxSuccess = 0x40000e64; lmacProcessAckTimeout = 0x40000e68; //lmacProcessTxComplete = 0x40000e6c; -ppRemoveHTC = 0x40000e70; +//ppRemoveHTC = 0x40000e70; get_estimated_batime = 0x40000e74; is_use_muedca = 0x40000e78; hal_mac_tx_clr_mplen = 0x40000e7c; diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index 8c5331413b..1af4e35250 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -306,10 +306,15 @@ typedef struct { wifi_sae_pwe_method_t sae_pwe_h2e; /**< Whether SAE hash to element is enabled */ uint8_t failure_retry_cnt; /**< Number of connection retries station will do before moving to next AP. scan_method should be set as WIFI_ALL_CHANNEL_SCAN to use this config. Note: Enabling this may cause connection time to increase incase best AP doesn't behave properly. */ - uint8_t he_dcm_set:1; /**< Whether DCM max.constellation for transmission and reception is set. */ - uint8_t he_dcm_max_constellation_tx:2; /**< Indicate the max.constellation for DCM in TB PPDU the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */ - uint8_t he_dcm_max_constellation_rx:2; /**< Indicate the max.constellation for DCM in both Data field and HE-SIG-B field the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */ - uint8_t he_mcs9_enabled:1; /**< Whether to support HE-MCS 0 to 9. The default value is 0. */ + uint32_t he_dcm_set:1; /**< Whether DCM max.constellation for transmission and reception is set. */ + uint32_t he_dcm_max_constellation_tx:2; /**< Indicate the max.constellation for DCM in TB PPDU the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */ + uint32_t he_dcm_max_constellation_rx:2; /**< Indicate the max.constellation for DCM in both Data field and HE-SIG-B field the STA supported. 0: not supported. 1: BPSK, 2: QPSK, 3: 16-QAM. The default value is 3. */ + uint32_t he_mcs9_enabled:1; /**< Whether to support HE-MCS 0 to 9. The default value is 0. */ + uint32_t he_su_beamformee_disabled:1; /**< Whether to disable support for operation as an SU beamformee. */ + uint32_t he_trig_su_bmforming_feedback_disabled:1; /**< Whether to disable support the transmission of SU feedback in an HE TB sounding sequence. */ + uint32_t he_trig_mu_bmforming_partial_feedback_disabled:1; /**< Whether to disable support the transmission of partial-bandwidth MU feedback in an HE TB sounding sequence. */ + uint32_t he_trig_cqi_feedback_disabled:1; /**< Whether to disable support the transmission of CQI feedback in an HE TB sounding sequence. */ + uint32_t he_reserved:22; /**< Reserved for future feature set */ } wifi_sta_config_t; /** @brief Configuration data for device's AP or STA. diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 41fa4f18bd..46ddf74df0 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 41fa4f18bd21fee18842914aeabbd5c4132dbf2f +Subproject commit 46ddf74df072618a3e6cf2f9bc0bd727a0f21574