alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-14 22:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(uart): Add sdkconfig.ci.iram_safe test for UART driver

Browse Source
This commit is contained in:
Song Ruo Jing
2023-08-29 12:25:05 +08:00
parent abc89df287
commit 767698b90d
20 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1008,7 +1008,7 @@ FORCE_INLINE_ATTR void uart_ll_force_xon(uart_port_t uart_num)
*
* @return UART module FSM status.
*/
FORCE_INLINE_ATTR uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
FORCE_INLINE_ATTR uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
return REG_GET_FIELD(UART_STATUS_REG(uart_num), UART_ST_UTX_OUT);
}

2
components/hal/esp32c2/include/hal/uart_ll.h
View File

@@ -943,7 +943,7 @@ FORCE_INLINE_ATTR void uart_ll_force_xon(uart_port_t uart_num)
*
* @return UART module FSM status.
*/
FORCE_INLINE_ATTR uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
FORCE_INLINE_ATTR uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
return REG_GET_FIELD(UART_FSM_STATUS_REG(uart_num), UART_ST_UTX_OUT);
}

2
components/hal/esp32c3/include/hal/uart_ll.h
View File

@@ -1006,7 +1006,7 @@ FORCE_INLINE_ATTR void uart_ll_force_xon(uart_port_t uart_num)
*
* @return UART module FSM status.
*/
FORCE_INLINE_ATTR uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
FORCE_INLINE_ATTR uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
return REG_GET_FIELD(UART_FSM_STATUS_REG(uart_num), UART_ST_UTX_OUT);
}

2
components/hal/esp32c6/include/hal/uart_ll.h
View File

@@ -1241,7 +1241,7 @@ FORCE_INLINE_ATTR void uart_ll_force_xon(uart_port_t uart_num)
*
* @return UART module FSM status.
*/
FORCE_INLINE_ATTR uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
FORCE_INLINE_ATTR uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
uart_dev_t *hw = UART_LL_GET_HW(uart_num);
return hw->fsm_status.st_utx_out;

2
components/hal/esp32h2/include/hal/uart_ll.h
View File

@@ -1069,7 +1069,7 @@ FORCE_INLINE_ATTR void uart_ll_force_xon(uart_port_t uart_num)
*
* @return UART module FSM status.
*/
FORCE_INLINE_ATTR uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
FORCE_INLINE_ATTR uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
return REG_GET_FIELD(UART_FSM_STATUS_REG(uart_num), UART_ST_UTX_OUT);
}

11
components/hal/esp32p4/include/hal/uart_ll.h
View File

@@ -186,6 +186,7 @@ static inline uint32_t uart_ll_get_baudrate(uart_dev_t *hw, uint32_t sclk_freq)
// typeof(hw->clkdiv_sync) div_reg = hw->clkdiv_sync;
// return ((sclk_freq << 4)) / (((div_reg.clkdiv << 4) | div_reg.clkdiv_frag) * (HAL_FORCE_READ_U32_REG_FIELD(hw->clk_conf, sclk_div_num) + 1));
HAL_ASSERT(false);
return 115200; // TODO: IDF-5338
}
/**
@@ -937,8 +938,7 @@ static inline uint16_t uart_ll_get_rx_tout_thr(uart_dev_t *hw)
*/
static inline uint16_t uart_ll_max_tout_thrd(uart_dev_t *hw)
{
// return UART_RX_TOUT_THRHD_V;
HAL_ASSERT(false);
return UART_RX_TOUT_THRHD_V;
}
/**
@@ -1035,16 +1035,15 @@ static inline void uart_ll_force_xon(uart_port_t uart_num)
}
/**
* @brief Get UART finite-state machine status.
* @brief Get UART transmitter finite-state machine status.
*
* @param uart_num UART port number, the max port number is (UART_NUM_MAX -1).
*
* @return UART module FSM status.
*/
static inline uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
static inline uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
// return REG_GET_FIELD(UART_FSM_STATUS_REG(uart_num), UART_ST_UTX_OUT);
HAL_ASSERT(false);
return REG_GET_FIELD(UART_FSM_STATUS_REG(uart_num), UART_ST_UTX_OUT);
}
#ifdef __cplusplus

2
components/hal/esp32s2/include/hal/uart_ll.h
View File

@@ -939,7 +939,7 @@ FORCE_INLINE_ATTR void uart_ll_force_xon(uart_port_t uart_num)
*
* @return UART module FSM status.
*/
FORCE_INLINE_ATTR uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
FORCE_INLINE_ATTR uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
return REG_GET_FIELD(UART_FSM_STATUS_REG(uart_num), UART_ST_UTX_OUT);
}

2
components/hal/esp32s3/include/hal/uart_ll.h
View File

@@ -961,7 +961,7 @@ FORCE_INLINE_ATTR void uart_ll_force_xon(uart_port_t uart_num)
*
* @return UART module FSM status.
*/
FORCE_INLINE_ATTR uint32_t uart_ll_get_fsm_status(uart_port_t uart_num)
FORCE_INLINE_ATTR uint32_t uart_ll_get_tx_fsm_status(uart_port_t uart_num)
{
return REG_GET_FIELD(UART_FSM_STATUS_REG(uart_num), UART_ST_UTX_OUT);
}

4
components/hal/linker.lf
View File

@@ -14,10 +14,6 @@ entries:
spi_hal_iram (noflash)
if HAL_SPI_SLAVE_FUNC_IN_IRAM = y:
spi_slave_hal_iram (noflash)
if UART_ISR_IN_IRAM = y || ESP_PANIC_HANDLER_IRAM = y:
uart_hal_iram (noflash)
else:
uart_hal_iram (default)
if SOC_LEDC_SUPPORTED = y:
ledc_hal_iram (noflash)
if SOC_I2C_SUPPORTED = y: