diff --git a/components/hal/adc_hal.c b/components/hal/adc_hal.c index 4cb8922a86..81260a77ec 100644 --- a/components/hal/adc_hal.c +++ b/components/hal/adc_hal.c @@ -163,20 +163,12 @@ void adc_hal_onetime_start(adc_digi_config_t *adc_digi_config) void adc_hal_adc1_onetime_sample_enable(bool enable) { - if (enable) { - adc_ll_adc1_onetime_sample_ena(); - } else { - adc_ll_adc1_onetime_sample_dis(); - } + adc_ll_adc1_onetime_sample_enable(enable); } void adc_hal_adc2_onetime_sample_enable(bool enable) { - if (enable) { - adc_ll_adc2_onetime_sample_ena(); - } else { - adc_ll_adc2_onetime_sample_dis(); - } + adc_ll_adc2_onetime_sample_enable(enable); } void adc_hal_onetime_channel(adc_ll_num_t unit, adc_channel_t channel) diff --git a/components/hal/esp32/include/hal/adc_ll.h b/components/hal/esp32/include/hal/adc_ll.h index ac8e9bd39c..587d7e7a34 100644 --- a/components/hal/esp32/include/hal/adc_ll.h +++ b/components/hal/esp32/include/hal/adc_ll.h @@ -299,9 +299,8 @@ static inline void adc_ll_rtc_enable_channel(adc_ll_num_t adc_n, int channel) * @note Only one channel can be selected in once measurement. * * @param adc_n ADC unit. - * @param channel ADC channel number for each ADCn. */ -static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n, int channel) +static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n) { if (adc_n == ADC_NUM_1) { SENS.sar_meas_start1.sar1_en_pad = 0; //only one channel is selected. diff --git a/components/hal/esp32c3/include/hal/adc_ll.h b/components/hal/esp32c3/include/hal/adc_ll.h index 913b59ed35..1287d2c368 100644 --- a/components/hal/esp32c3/include/hal/adc_ll.h +++ b/components/hal/esp32c3/include/hal/adc_ll.h @@ -912,14 +912,9 @@ static inline bool adc_ll_intr_get_status(adc_ll_intr_t mask) } //--------------------------------adc1------------------------------// -static inline void adc_ll_adc1_onetime_sample_ena(void) +static inline void adc_ll_adc1_onetime_sample_enable(bool enable) { - APB_SARADC.onetime_sample.adc1_onetime_sample = 1; -} - -static inline void adc_ll_adc1_onetime_sample_dis(void) -{ - APB_SARADC.onetime_sample.adc1_onetime_sample = 0; + APB_SARADC.onetime_sample.adc1_onetime_sample = enable; } static inline uint32_t adc_ll_adc1_read(void) @@ -929,14 +924,9 @@ static inline uint32_t adc_ll_adc1_read(void) } //--------------------------------adc2------------------------------// -static inline void adc_ll_adc2_onetime_sample_ena(void) +static inline void adc_ll_adc2_onetime_sample_enable(bool enable) { - APB_SARADC.onetime_sample.adc2_onetime_sample = 1; -} - -static inline void adc_ll_adc2_onetime_sample_dis(void) -{ - APB_SARADC.onetime_sample.adc2_onetime_sample = 0; + APB_SARADC.onetime_sample.adc2_onetime_sample = enable; } static inline uint32_t adc_ll_adc2_read(void) diff --git a/components/hal/esp32s2/include/hal/adc_ll.h b/components/hal/esp32s2/include/hal/adc_ll.h index 1d306db61a..bf1ac802e2 100644 --- a/components/hal/esp32s2/include/hal/adc_ll.h +++ b/components/hal/esp32s2/include/hal/adc_ll.h @@ -690,7 +690,7 @@ static inline void adc_ll_rtc_enable_channel(adc_ll_num_t adc_n, int channel) * @param adc_n ADC unit. * @param channel ADC channel number for each ADCn. */ -static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n, int channel) +static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n) { if (adc_n == ADC_NUM_1) { SENS.sar_meas1_ctrl2.sar1_en_pad = 0; //only one channel is selected. diff --git a/components/hal/esp32s3/include/hal/adc_ll.h b/components/hal/esp32s3/include/hal/adc_ll.h index b37575193a..276d587adf 100644 --- a/components/hal/esp32s3/include/hal/adc_ll.h +++ b/components/hal/esp32s3/include/hal/adc_ll.h @@ -606,7 +606,7 @@ static inline void adc_ll_rtc_enable_channel(adc_ll_num_t adc_n, int channel) * @param adc_n ADC unit. * @param channel ADC channel number for each ADCn. */ -static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n, int channel) +static inline void adc_ll_rtc_disable_channel(adc_ll_num_t adc_n) { if (adc_n == ADC_NUM_1) { SENS.sar_meas1_ctrl2.sar1_en_pad = 0; //only one channel is selected.