espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-22 17:47:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/uart1_intr_and_pwm' into 'master'

Browse Source 
bugfix(uart): fix uart1 interrupt

See merge request sdk/ESP8266_RTOS_SDK!680
This commit is contained in:
Wang Jia Lin
2019-01-02 15:25:39 +08:00
parent cdd32ade23 def1edc36b
commit cc8d13fedd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp8266/driver/uart.c
View File

@ -381,6 +381,7 @@ static void uart_intr_service(void *arg)
}
do {
uart_intr_status = UART[uart_num]->int_st.val;
if (uart_intr_status != 0) {
if (uart_isr_func[uart_num].fn != NULL) {
uart_isr_func[uart_num].fn(uart_isr_func[uart_num].args);
@ -878,7 +879,6 @@ esp_err_t uart_driver_install(uart_port_t uart_num, int rx_buffer_size, int tx_b
{
esp_err_t r;
UART_CHECK((uart_num < UART_NUM_MAX), "uart_num error", ESP_ERR_INVALID_ARG);
UART_CHECK((uart_num == UART_NUM_1) ? (tx_buffer_size == 0) : 1, "uart1 cannot use tx_buffer", ESP_ERR_INVALID_ARG);
UART_CHECK((rx_buffer_size > UART_FIFO_LEN) || ((uart_num == UART_NUM_1) && (rx_buffer_size == 0)), "uart rx buffer length error(>128)", ESP_ERR_INVALID_ARG);
UART_CHECK((tx_buffer_size > UART_FIFO_LEN) || (tx_buffer_size == 0), "uart tx buffer length error(>128 or 0)", ESP_ERR_INVALID_ARG);
UART_CHECK((queue_size >= 0), "queue_size error(>=0)", ESP_ERR_INVALID_ARG);