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

fix(esp_modem): Correct exit of CMUX mode

Browse Source 
* Fix DISC message's control field (0xFF->0xFE) to keep Poll bit cleared
* Accept UIH resp on DISC for both (0xFF, 0xFE) ignoring P/F bit
* Fix timeout processing when handling DISC message

Closes https://github.com/espressif/esp-protocols/issues/103
This commit is contained in:
David Cermak
2022-08-19 11:45:53 +02:00
parent 8f00fc182a
commit 2099434b3f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_modem/src/esp_modem_cmux.cpp
View File

@ -82,7 +82,7 @@ void CMux::send_disconnect(size_t i)
{ {
if (i == 0) { // control terminal if (i == 0) { // control terminal
uint8_t frame[] = { uint8_t frame[] = {
SOF_MARKER, 0x3, 0xFF, 0x5, 0xC3, 0x1, 0xE7, SOF_MARKER }; SOF_MARKER, 0x3, 0xEF, 0x5, 0xC3, 0x1, 0xF2, SOF_MARKER };
term->write(frame, 8); term->write(frame, 8);
} else { // separate virtual terminal } else { // separate virtual terminal
uint8_t frame[] = { uint8_t frame[] = {
@ -142,7 +142,7 @@ void CMux::data_available(uint8_t *data, size_t len)
read_cb[virtual_term](payload_start, total_payload_size); read_cb[virtual_term](payload_start, total_payload_size);
#endif #endif
} }
} else if (type == 0xFF && dlci == 0) { // notify the internal DISC command } else if ((type&FT_UIH) == FT_UIH && dlci == 0) { // notify the internal DISC command
Scoped<Lock> l(lock); Scoped<Lock> l(lock);
sabm_ack = dlci; sabm_ack = dlci;
} }
@ -325,11 +325,12 @@ bool CMux::on_cmux_data(uint8_t *data, size_t actual_len)
bool CMux::deinit() bool CMux::deinit()
{ {
int timeout = 0; int timeout;
sabm_ack = -1; sabm_ack = -1;
// First disconnect all (2) virtual terminals // First disconnect all (2) virtual terminals
for (size_t i = 1; i < 3; i++) { for (size_t i = 1; i < 3; i++) {
send_disconnect(i); send_disconnect(i);
timeout = 0;
while (true) { while (true) {
usleep(10'000); usleep(10'000);
Scoped<Lock> l(lock); Scoped<Lock> l(lock);
@ -345,6 +346,7 @@ bool CMux::deinit()
sabm_ack = -1; sabm_ack = -1;
// Then disconnect the control terminal // Then disconnect the control terminal
send_disconnect(0); send_disconnect(0);
timeout = 0;
while (true) { while (true) {
usleep(10'000); usleep(10'000);
Scoped<Lock> l(lock); Scoped<Lock> l(lock);