espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-20 14:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp-modem): Uart Terminal read_cb race

Browse Source
This commit is contained in:
David Cermak
2022-10-10 15:39:09 +02:00
parent a9b5e66d0f
commit a02bf05eed
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/esp_modem/src/esp_modem_uart.cpp
View File

@ -72,8 +72,8 @@ public:
void set_read_cb(std::function<bool(uint8_t *data, size_t len)> f) override
{
ESP_MODEM_THROW_IF_FALSE(signal.wait(TASK_PARAMS, 1000), "Failed to set UART task params");
on_read = std::move(f);
signal.set(TASK_PARAMS);
}
private:
@ -118,7 +118,6 @@ std::unique_ptr<Terminal> create_uart_terminal(const esp_modem_dte_config *confi
void UartTerminal::task()
{
std::function<bool(uint8_t *data, size_t len)> on_read_priv = nullptr;
uart_event_t event;
size_t len;
signal.set(TASK_INIT);
@ -127,17 +126,15 @@ void UartTerminal::task()
return; // exits to the static method where the task gets deleted
}
while (signal.is_any(TASK_START)) {
signal.set(TASK_PARAMS);
if (get_event(event, 100)) {
if (signal.is_any(TASK_PARAMS)) {
on_read_priv = on_read;
signal.clear(TASK_PARAMS);
}
signal.clear(TASK_PARAMS);
switch (event.type) {
case UART_DATA:
uart_get_buffered_data_len(uart.port, &len);
if (len && on_read_priv) {
if (on_read_priv(nullptr, len)) {
on_read_priv = nullptr;
if (len && on_read) {
if (on_read(nullptr, len)) {
on_read = nullptr;
}
}
break;