alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix compiling when included from C++

Browse Source
This commit is contained in:
0xFEEDC0DE64 2022-02-18 15:37:07 +01:00
parent b66cc63c41
commit c86fba7919
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/hal/esp32/include/hal/i2s_ll.h
View File

@ -754,7 +754,7 @@ static inline void i2s_ll_rx_set_pdm_dsr(i2s_dev_t *hw, i2s_pdm_dsr_t dsr)
*/ */
static inline void i2s_ll_rx_get_pdm_dsr(i2s_dev_t *hw, i2s_pdm_dsr_t *dsr) static inline void i2s_ll_rx_get_pdm_dsr(i2s_dev_t *hw, i2s_pdm_dsr_t *dsr)
{ {
*dsr = hw->pdm_conf.rx_sinc_dsr_16_en; *dsr = (i2s_pdm_dsr_t)hw->pdm_conf.rx_sinc_dsr_16_en;
} }
/** /**

8
components/hal/include/hal/adc_hal.h
View File

@ -6,6 +6,10 @@
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "esp_err.h" #include "esp_err.h"
#include "soc/soc_caps.h" #include "soc/soc_caps.h"
#include "hal/dma_types.h" #include "hal/dma_types.h"
@ -382,3 +386,7 @@ uint32_t adc_hal_self_calibration(adc_ll_num_t adc_n, adc_channel_t channel, adc
* @prarm adc_n ADC unit. * @prarm adc_n ADC unit.
*/ */
#define adc_hal_rtc_output_invert(adc_n, inv_en) adc_ll_rtc_output_invert(adc_n, inv_en) #define adc_hal_rtc_output_invert(adc_n, inv_en) adc_ll_rtc_output_invert(adc_n, inv_en)
#ifdef __cplusplus
}
#endif