55 */
66
77#include <sys/param.h>
8- #include "sdkconfig.h"
98#include "hal/adc_hal.h"
109#include "hal/assert.h"
1110#include "soc/lldesc.h"
12- #include "soc/soc_caps .h"
11+ #include "soc/soc_caps_full .h"
1312
14- #if CONFIG_IDF_TARGET_ESP32
13+ #if SOC_IS ( ESP32 )
1514//ADC utilises I2S0 DMA on ESP32
1615#include "hal/i2s_hal.h"
1716#include "hal/i2s_types.h"
@@ -58,7 +57,7 @@ void adc_hal_digi_init(adc_hal_dma_ctx_t *hal)
5857 adc_ll_digi_set_clk_div (ADC_LL_DIGI_SAR_CLK_DIV_DEFAULT );
5958
6059 adc_ll_digi_dma_set_eof_num (hal -> eof_num );
61- #if CONFIG_IDF_TARGET_ESP32
60+ #if SOC_IS ( ESP32 )
6261 i2s_ll_rx_set_sample_bit (adc_hal_i2s_dev , SAMPLE_BITS , SAMPLE_BITS );
6362 i2s_ll_rx_enable_mono_mode (adc_hal_i2s_dev , 1 );
6463 i2s_ll_rx_force_enable_fifo_mod (adc_hal_i2s_dev , 1 );
@@ -91,20 +90,20 @@ void adc_hal_digi_deinit()
9190---------------------------------------------------------------*/
9291static adc_ll_digi_convert_mode_t get_convert_mode (adc_digi_convert_mode_t convert_mode )
9392{
94- #if CONFIG_IDF_TARGET_ESP32 || SOC_ADC_DIGI_CONTROLLER_NUM == 1
93+ #if SOC_IS ( ESP32 ) || SOC_ADC_DIGI_CONTROLLER_NUM == 1
9594 return ADC_LL_DIGI_CONV_ONLY_ADC1 ;
9695#elif (SOC_ADC_DIGI_CONTROLLER_NUM >= 2 )
9796 switch (convert_mode ) {
98- case ADC_CONV_SINGLE_UNIT_1 :
99- return ADC_LL_DIGI_CONV_ONLY_ADC1 ;
100- case ADC_CONV_SINGLE_UNIT_2 :
101- return ADC_LL_DIGI_CONV_ONLY_ADC2 ;
102- case ADC_CONV_BOTH_UNIT :
103- return ADC_LL_DIGI_CONV_BOTH_UNIT ;
104- case ADC_CONV_ALTER_UNIT :
105- return ADC_LL_DIGI_CONV_ALTER_UNIT ;
106- default :
107- abort ();
97+ case ADC_CONV_SINGLE_UNIT_1 :
98+ return ADC_LL_DIGI_CONV_ONLY_ADC1 ;
99+ case ADC_CONV_SINGLE_UNIT_2 :
100+ return ADC_LL_DIGI_CONV_ONLY_ADC2 ;
101+ case ADC_CONV_BOTH_UNIT :
102+ return ADC_LL_DIGI_CONV_BOTH_UNIT ;
103+ case ADC_CONV_ALTER_UNIT :
104+ return ADC_LL_DIGI_CONV_ALTER_UNIT ;
105+ default :
106+ abort ();
108107 }
109108#endif
110109}
@@ -118,7 +117,7 @@ static adc_ll_digi_convert_mode_t get_convert_mode(adc_digi_convert_mode_t conve
118117 */
119118static void adc_hal_digi_sample_freq_config (adc_hal_dma_ctx_t * hal , adc_continuous_clk_src_t clk_src , uint32_t clk_src_freq_hz , uint32_t sample_freq_hz )
120119{
121- #if !CONFIG_IDF_TARGET_ESP32
120+ #if !SOC_IS ( ESP32 )
122121 uint32_t interval = clk_src_freq_hz / (ADC_LL_CLKM_DIV_NUM_DEFAULT + ADC_LL_CLKM_DIV_A_DEFAULT / ADC_LL_CLKM_DIV_B_DEFAULT + 1 ) / 2 / sample_freq_hz ;
123122 //set sample interval
124123 adc_ll_digi_set_trigger_interval (interval );
@@ -218,14 +217,14 @@ void adc_hal_digi_dma_link(adc_hal_dma_ctx_t *hal, uint8_t *data_buf)
218217 .dw0 .suc_eof = 0 ,
219218 .dw0 .owner = 1 ,
220219 .buffer = data_buf ,
221- .next = & desc [n + 1 ]
220+ .next = & desc [n + 1 ]
222221 };
223222 eof_size -= this_len ;
224223 data_buf += this_len ;
225224 n ++ ;
226225 }
227226 }
228- desc [n - 1 ].next = desc_head ;
227+ desc [n - 1 ].next = desc_head ;
229228}
230229
231230adc_hal_dma_desc_status_t adc_hal_get_reading_result (adc_hal_dma_ctx_t * hal , const intptr_t eof_desc_addr , uint8_t * * buffer , uint32_t * len )
0 commit comments