cpu/esp32: cleanup of ESP-IDF interface API (module esp_idf_api)

cpu/esp32/esp-idf/esp_idf.mk

@@ -1,6 +1,6 @@
 # common definitions for all ESP-IDF modules
 
-# additional include pathes required by als ESP-IDF module
+# additional include pathes required by ESP-IDF module
 INCLUDES += -I$(ESP32_SDK_DIR)/components/bootloader_support/include
 INCLUDES += -I$(ESP32_SDK_DIR)/components/bootloader_support/include_bootloader
 INCLUDES += -I$(ESP32_SDK_DIR)/components/driver/$(CPU_FAM)/include

cpu/esp32/esp-idf/esp_idf_cflags.mk

@@ -1,5 +1,8 @@
 # common definitions for all ESP-IDF modules
 
+# indicate that ESP-IDF code is compiled
+CFLAGS += -DESP_IDF_CODE
+
 # shortcuts used by ESP-IDF
 CFLAGS += -Dasm=__asm
 CFLAGS += -Dtypeof=__typeof__

cpu/esp32/esp-idf/include/driver/gpio.h

@@ -0,0 +1,24 @@
+#ifndef DRIVER_GPIO_H
+#define DRIVER_GPIO_H
+
+#ifdef ESP_IDF_CODE
+
+#include_next "driver/gpio.h"
+
+#else
+
+#include "hal/gpio_types.h"
+
+#define GPIO_PIN_COUNT  (SOC_GPIO_PIN_COUNT)
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DRIVER_GPIO_H */

cpu/esp32/include/adc_arch.h

@@ -34,10 +34,9 @@ extern "C" {
 #include "periph/adc.h"
 #include "periph/gpio.h"
 
+#include "driver/adc.h"
 #include "hal/adc_types.h"
 
-#include "esp_idf_api/adc.h"
-
 /**
  * @brief  Attenuations that can be set for ADC lines
  *
@@ -112,9 +111,9 @@ int adc_line_vref_to_gpio(adc_t line, gpio_t gpio);
  * @return  0 on success
  * @return  -1 on invalid ADC line
  */
-static inline int adc_vref_to_gpio25 (void)
+static inline int adc_vref_to_gpio25(void)
 {
-    return esp_idf_adc_vref_to_gpio(ADC_UNIT_2, GPIO25);
+    return adc_vref_to_gpio(ADC_UNIT_2, GPIO25);
 }
 #endif