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

uart: format driver code by astyle

Browse Source
This commit is contained in:
morris
2021-05-19 20:32:55 +08:00
committed by SalimTerryLi
parent 61d5e5a93e
commit 5253a6c916
1 changed files with 149 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/driver/uart.c
View File

@@ -801,8 +801,7 @@ static void UART_ISR_ATTR uart_rx_intr_handler_default(void *param)
UART_EXIT_CRITICAL_ISR(&(uart_context[uart_num].spinlock)); UART_EXIT_CRITICAL_ISR(&(uart_context[uart_num].spinlock));
} }
} }
} } else if ((uart_intr_status & UART_INTR_RXFIFO_TOUT)
else if ((uart_intr_status & UART_INTR_RXFIFO_TOUT)
|| (uart_intr_status & UART_INTR_RXFIFO_FULL) || (uart_intr_status & UART_INTR_RXFIFO_FULL)
|| (uart_intr_status & UART_INTR_CMD_CHAR_DET) || (uart_intr_status & UART_INTR_CMD_CHAR_DET)
) { ) {
@@ -1117,7 +1116,7 @@ static int uart_tx_all(uart_port_t uart_num, const char* src, size_t size, bool
return original_size; return original_size;
} }
int uart_write_bytes(uart_port_t uart_num, const char* src, size_t size) int uart_write_bytes(uart_port_t uart_num, const void *src, size_t size)
{ {
UART_CHECK((uart_num < UART_NUM_MAX), "uart_num error", (-1)); UART_CHECK((uart_num < UART_NUM_MAX), "uart_num error", (-1));
UART_CHECK((p_uart_obj[uart_num] != NULL), "uart driver error", (-1)); UART_CHECK((p_uart_obj[uart_num] != NULL), "uart driver error", (-1));
@@ -1125,7 +1124,7 @@ int uart_write_bytes(uart_port_t uart_num, const char* src, size_t size)
return uart_tx_all(uart_num, src, size, 0, 0); return uart_tx_all(uart_num, src, size, 0, 0);
} }
int uart_write_bytes_with_break(uart_port_t uart_num, const char* src, size_t size, int brk_len) int uart_write_bytes_with_break(uart_port_t uart_num, const void *src, size_t size, int brk_len)
{ {
UART_CHECK((uart_num < UART_NUM_MAX), "uart_num error", (-1)); UART_CHECK((uart_num < UART_NUM_MAX), "uart_num error", (-1));
UART_CHECK((p_uart_obj[uart_num]), "uart driver error", (-1)); UART_CHECK((p_uart_obj[uart_num]), "uart driver error", (-1));
@@ -1365,9 +1364,13 @@ esp_err_t uart_driver_install(uart_port_t uart_num, int rx_buffer_size, int tx_b
uart_hal_disable_intr_mask(&(uart_context[uart_num].hal), UART_INTR_MASK); uart_hal_disable_intr_mask(&(uart_context[uart_num].hal), UART_INTR_MASK);
uart_hal_clr_intsts_mask(&(uart_context[uart_num].hal), UART_INTR_MASK); uart_hal_clr_intsts_mask(&(uart_context[uart_num].hal), UART_INTR_MASK);
r = uart_isr_register(uart_num, uart_rx_intr_handler_default, p_uart_obj[uart_num], intr_alloc_flags, &p_uart_obj[uart_num]->intr_handle); r = uart_isr_register(uart_num, uart_rx_intr_handler_default, p_uart_obj[uart_num], intr_alloc_flags, &p_uart_obj[uart_num]->intr_handle);
if (r!=ESP_OK) goto err; if (r != ESP_OK) {
goto err;
}
r = uart_intr_config(uart_num, &uart_intr); r = uart_intr_config(uart_num, &uart_intr);
if (r!=ESP_OK) goto err; if (r != ESP_OK) {
goto err;
}
return r; return r;
err: err: