From 0fcc8ac2467676d2c4783bdda9ea31a95586f3b3 Mon Sep 17 00:00:00 2001 From: zhji Date: Wed, 19 Mar 2025 21:53:54 +0800 Subject: [PATCH] [fix] fix uart fifo_level and interrupt mask error --- driver/inc/reg/uart_reg.h | 2 +- driver/inc/uart.h | 4 ++-- driver/src/uart.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/driver/inc/reg/uart_reg.h b/driver/inc/reg/uart_reg.h index d9cffd6..60b0d50 100644 --- a/driver/inc/reg/uart_reg.h +++ b/driver/inc/reg/uart_reg.h @@ -89,7 +89,7 @@ #define UART_UARTIFLS_TXIFLSEL_POS (0U) #define UART_UARTIFLS_TXIFLSEL_MASK (0x7 << UART_UARTIFLS_TXIFLSEL_POS) #define UART_UARTIFLS_RXIFLSEL_POS (3U) -#define UART_UARTIFLS_RXIFLSEL_MASK (0x7 << UART_UARTIFLS_TXIFLSEL_POS) +#define UART_UARTIFLS_RXIFLSEL_MASK (0x7 << UART_UARTIFLS_RXIFLSEL_POS) /* UART_UARTIMSC_OFFSET @0x038 */ #define UART_UARTIMSC_RIMIM (1 << 0U) diff --git a/driver/inc/uart.h b/driver/inc/uart.h index d6b787e..25489ae 100644 --- a/driver/inc/uart.h +++ b/driver/inc/uart.h @@ -77,8 +77,8 @@ void uart_write_block(uint8_t uart_id, uint8_t *data, uint32_t length); uint32_t uart_int_get_raw_status(uint8_t uart_id); uint32_t uart_int_get_status(uint8_t uart_id); void uart_int_clear(uint8_t uart_id, uint32_t int_type); -void uart_int_mask(uint8_t uart_id, uint32_t int_type); -void uart_int_unmask(uint8_t uart_id, uint32_t int_type); +void uart_int_enable(uint8_t uart_id, uint32_t int_type); +void uart_int_disable(uint8_t uart_id, uint32_t int_type); uint32_t uart_int_get_mask_status(uint8_t uart_id); #ifdef __cplusplus diff --git a/driver/src/uart.c b/driver/src/uart.c index 7a7e58e..47e8b13 100644 --- a/driver/src/uart.c +++ b/driver/src/uart.c @@ -160,7 +160,7 @@ void uart_int_clear(uint8_t uart_id, uint32_t int_type) putreg32(val, addr); } -void uart_int_mask(uint8_t uart_id, uint32_t int_type) +void uart_int_enable(uint8_t uart_id, uint32_t int_type) { uint32_t addr, val; @@ -170,7 +170,7 @@ void uart_int_mask(uint8_t uart_id, uint32_t int_type) putreg32(val, addr); } -void uart_int_unmask(uint8_t uart_id, uint32_t int_type) +void uart_int_disable(uint8_t uart_id, uint32_t int_type) { uint32_t addr, val;