cpu/esp32/esp-idf-api: migration to ESP-IDF v5.4

Author: gschorcht

cpu/esp32/esp-idf-api/Makefile

@@ -2,8 +2,9 @@ MODULE = esp_idf_api
 
 # ESP-IDF header files must be found first in this module. Therefore,
 # the ESP-IDF include paths must come before the RIOT include paths.
-PRE_INCLUDES += -I$(ESP32_SDK_DIR)/components/driver/include
 PRE_INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_common/include
+PRE_INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_driver_gpio/include
+PRE_INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_driver_uart/include
 PRE_INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/include
 PRE_INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_rom/include
 PRE_INCLUDES += -I$(ESP32_SDK_DIR)/components/hal/include

cpu/esp32/esp-idf-api/uart.c

@@ -20,31 +20,23 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "driver/uart.h"
-#include "hal/uart_hal.h"
+#include "esp_private/uart_share_hw_ctrl.h"
+#include "esp_rom_uart.h"
+#include "hal/uart_ll.h"
 
 #include "esp_idf_api/uart.h"
 
-static uart_hal_context_t _uart_hal_ctx[] = {
-#if UART_NUM_MAX >= 1
-    {
-        .dev = UART_LL_GET_HW(0),
-    },
-#endif
-#if UART_NUM_MAX >= 2
-    {
-        .dev = UART_LL_GET_HW(1),
-    },
-#endif
-#if UART_NUM_MAX >= 3
-    {
-        .dev = UART_LL_GET_HW(2),
-    },
-#endif
-};
-
 void esp_idf_uart_set_wakeup_threshold(unsigned uart_num, uint32_t threshold)
 {
-    assert(uart_num < ARRAY_SIZE(_uart_hal_ctx));
-    uart_hal_set_wakeup_thrd(&_uart_hal_ctx[uart_num], threshold);
+    assert(uart_num < SOC_UART_NUM);
+
+    HP_UART_PAD_CLK_ATOMIC() {
+        uart_ll_set_wakeup_thrd(UART_LL_GET_HW(uart_num), threshold);
+        uart_ll_enable_pad_sleep_clock(UART_LL_GET_HW(uart_num), true);
+    }
+}
+
+void esp_idf_esp_rom_output_tx_wait_idle(unsigned uart_num)
+{
+    esp_rom_output_tx_wait_idle(uart_num);
 }

cpu/esp32/include/esp_idf_api/gpio.h

@@ -21,6 +21,7 @@
 
 #include "esp_err.h"
 #include "hal/gpio_types.h"
+#include "driver/gpio.h"
 
 #ifndef DOXYGEN     /* Hide implementation details from doxygen */
 

cpu/esp32/include/esp_idf_api/uart.h

@@ -27,6 +27,8 @@ extern "C" {
 
 void esp_idf_uart_set_wakeup_threshold(unsigned uart_num, uint32_t threshold);
 
+void esp_idf_esp_rom_output_tx_wait_idle(unsigned uart_num);
+
 #ifdef __cplusplus
 }
 #endif