From d35173c14730287275b03ec4d36aa2fe5959c6b0 Mon Sep 17 00:00:00 2001 From: Armando Date: Thu, 14 Jan 2021 14:46:04 +0800 Subject: [PATCH] small fix for cherrypick --- components/esp_wifi/src/wifi_init.c | 2 ++ components/hal/esp32c3/include/hal/gdma_ll.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/components/esp_wifi/src/wifi_init.c b/components/esp_wifi/src/wifi_init.c index 85d74a777c..7aa8cae0f3 100644 --- a/components/esp_wifi/src/wifi_init.c +++ b/components/esp_wifi/src/wifi_init.c @@ -280,9 +280,11 @@ void set_xpd_sar(bool en) } s_wifi_adc_xpd_flag = en; +#if !CONFIG_IDF_TARGET_ESP32C3 if (en) { adc_power_acquire(); } else { adc_power_release(); } +#endif } diff --git a/components/hal/esp32c3/include/hal/gdma_ll.h b/components/hal/esp32c3/include/hal/gdma_ll.h index 22410d3bdd..c3ad226bce 100644 --- a/components/hal/esp32c3/include/hal/gdma_ll.h +++ b/components/hal/esp32c3/include/hal/gdma_ll.h @@ -39,6 +39,13 @@ extern "C" { #define GDMA_LL_EVENT_RX_SUC_EOF (1<<1) #define GDMA_LL_EVENT_RX_DONE (1<<0) +#define GDMA_LL_TRIG_SRC_SPI2 (0) +#define GDMA_LL_TRIG_SRC_UART (2) +#define GDMA_LL_TRIG_SRC_I2S0 (3) +#define GDMA_LL_TRIG_SRC_AES (6) +#define GDMA_LL_TRIG_SRC_SHA (7) +#define GDMA_LL_TRIG_SRC_ADC_DAC (8) + ///////////////////////////////////// Common ///////////////////////////////////////// /** * @brief Enable DMA channel M2M mode (TX channel n forward data to RX channel n), disabled by default