Skip to content

uartEnd: Unlock mutex before detaching rx and tx #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2017
Merged

uartEnd: Unlock mutex before detaching rx and tx #554

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf89b4
uartEnd: Unlock mutex before detaching rx and tx
Raienryu97 Aug 2, 2017
7556063
Unlock UART MUTEX only for detaching Rx and Tx
Raienryu97 Aug 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cores/esp32/esp32-hal-uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rx
uart->dev->conf0.val = config;
#define TWO_STOP_BITS_CONF 0x3
#define ONE_STOP_BITS_CONF 0x1

if ( uart->dev->conf0.stop_bit_num == TWO_STOP_BITS_CONF) {
uart->dev->conf0.stop_bit_num = ONE_STOP_BITS_CONF;
uart->dev->rs485_conf.dl1_en = 1;
Expand Down Expand Up @@ -228,11 +228,12 @@ void uartEnd(uart_t* uart)
vQueueDelete(uart->queue);
}

uartDetachRx(uart);
uartDetachTx(uart);

uart->dev->conf0.val = 0;

UART_MUTEX_UNLOCK();

uartDetachRx(uart);
uartDetachTx(uart);
}

uint32_t uartAvailable(uart_t* uart)
Expand Down Expand Up @@ -419,4 +420,3 @@ int log_printf(const char *format, ...)
}
return len;
}