kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 18:13:49 +01:00
Code Releases Activity

cpu/esp32/periph/uart: migration to ESP-IDF v5.4

Browse Source
This commit is contained in:
Gunar Schorcht 2025-03-02 11:56:41 +01:00
parent 5a378edaa2
commit 6083a016aa
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cpu/esp32/include/periph_cpu.h
View File

@ -986,6 +986,38 @@ typedef struct {
gpio_t rxd; /**< GPIO used as RxD pin */ gpio_t rxd; /**< GPIO used as RxD pin */
} uart_conf_t; } uart_conf_t;
#ifndef DOXYGEN
/**
* @brief Override UART stop bits
*/
typedef enum {
UART_STOP_BITS_1 = 0x1, /*!< stop bit: 1bit*/
UART_STOP_BITS_1_5 = 0x2, /*!< stop bit: 1.5bits*/
UART_STOP_BITS_2 = 0x3, /*!< stop bit: 2bits*/
} uart_stop_bits_t;
#define HAVE_UART_STOP_BITS_T
/**
* @brief Marker for unsupported UART parity modes
*/
#define UART_MODE_UNSUPPORTED 0xf0
/**
* @brief Override UART parity values
*/
typedef enum {
UART_PARITY_NONE = 0x0,
UART_PARITY_EVEN = 0x2,
UART_PARITY_ODD = 0x3,
UART_PARITY_MARK = UART_MODE_UNSUPPORTED | 0,
UART_PARITY_SPACE = UART_MODE_UNSUPPORTED | 1,
} uart_parity_t;
#define HAVE_UART_PARITY_T
#endif /* !DOXYGEN */
/** /**
* @brief Maximum number of UART interfaces * @brief Maximum number of UART interfaces
*/ */

17
cpu/esp_common/periph/uart.c
View File

@ -59,11 +59,10 @@
#else /* defined(CPU_ESP8266) */ #else /* defined(CPU_ESP8266) */
#include "driver/periph_ctrl.h" #include "esp_cpu.h"
#include "esp_idf_api/uart.h"
#include "esp_private/periph_ctrl.h"
#include "esp_rom_gpio.h" #include "esp_rom_gpio.h"
#include "esp_rom_uart.h"
#include "hal/interrupt_controller_types.h"
#include "hal/interrupt_controller_ll.h"
#include "soc/gpio_reg.h" #include "soc/gpio_reg.h"
#include "soc/gpio_sig_map.h" #include "soc/gpio_sig_map.h"
#include "soc/gpio_struct.h" #include "soc/gpio_struct.h"
@ -189,7 +188,7 @@ int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, void *arg)
gpio_set_pin_usage(uart_config[uart].txd, _UART); gpio_set_pin_usage(uart_config[uart].txd, _UART);
gpio_set_pin_usage(uart_config[uart].rxd, _UART); gpio_set_pin_usage(uart_config[uart].rxd, _UART);
esp_rom_uart_tx_wait_idle(uart); esp_idf_esp_rom_output_tx_wait_idle(uart);
esp_rom_gpio_connect_out_signal(uart_config[uart].txd, esp_rom_gpio_connect_out_signal(uart_config[uart].txd,
_uarts[uart].signal_txd, false, false); _uarts[uart].signal_txd, false, false);
esp_rom_gpio_connect_in_signal(uart_config[uart].rxd, esp_rom_gpio_connect_in_signal(uart_config[uart].rxd,
@ -276,7 +275,7 @@ void uart_print_config(void)
static void IRAM _uart_intr_handler(void *arg) static void IRAM _uart_intr_handler(void *arg)
{ {
/* to satisfy the compiler */ /* to satisfy the compiler */
(void)arg; (void)arg;
irq_isr_enter(); irq_isr_enter();
@ -416,11 +415,11 @@ static void _uart_config(uart_t uart)
/* route all UART interrupt sources to same the CPU interrupt */ /* route all UART interrupt sources to same the CPU interrupt */
intr_matrix_set(PRO_CPU_NUM, _uarts[uart].int_src, CPU_INUM_UART); intr_matrix_set(PRO_CPU_NUM, _uarts[uart].int_src, CPU_INUM_UART);
/* we have to enable therefore the CPU interrupt here */ /* we have to enable therefore the CPU interrupt here */
intr_cntrl_ll_set_int_handler(CPU_INUM_UART, _uart_intr_handler, NULL); esp_cpu_intr_set_handler(CPU_INUM_UART, _uart_intr_handler, NULL);
intr_cntrl_ll_enable_interrupts(BIT(CPU_INUM_UART)); esp_cpu_intr_enable(BIT(CPU_INUM_UART));
#ifdef SOC_CPU_HAS_FLEXIBLE_INTC #ifdef SOC_CPU_HAS_FLEXIBLE_INTC
/* set interrupt level */ /* set interrupt level */
intr_cntrl_ll_set_int_level(CPU_INUM_UART, 1); esp_cpu_intr_set_priority(CPU_INUM_UART, 1);
#endif #endif
#endif /* CPU_ESP8266 */ #endif /* CPU_ESP8266 */
} }