4
0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-18 19:19:18 +08:00

Merge pull request #1727 from chenyong111/master

[net][at] Fix receive error data when AT CLI exits.
This commit is contained in:
朱天龙 (Armink) 2018-08-21 10:51:12 +08:00 committed by GitHub
commit 312897d2ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions

View File

@ -27,7 +27,7 @@
#include <rtthread.h>
#define AT_SW_VERSION "0.2.4"
#define AT_SW_VERSION "0.2.5"
#define DBG_ENABLE
#define DBG_SECTION_NAME "AT"

View File

@ -100,9 +100,6 @@ void at_cli_deinit(void)
rt_base_t int_lvl;
rt_device_t console;
rt_sem_detach(&console_rx_notice);
rt_ringbuffer_destroy(console_rx_fifo);
int_lvl = rt_hw_interrupt_disable();
console = rt_console_get_device();
if (console && odev_rx_ind)
@ -111,6 +108,9 @@ void at_cli_deinit(void)
rt_device_set_rx_indicate(console, odev_rx_ind);
}
rt_hw_interrupt_enable(int_lvl);
rt_sem_detach(&console_rx_notice);
rt_ringbuffer_destroy(console_rx_fifo);
}
#ifdef AT_USING_SERVER
@ -272,15 +272,16 @@ static void client_cli_parser(void)
}
}
rt_thread_delete(at_client);
rt_sem_detach(&client_rx_notice);
rt_ringbuffer_destroy(client_rx_fifo);
/* restore client device RX indicate */
{
int_lvl = rt_hw_interrupt_disable();
rt_device_set_rx_indicate(client->device, client_odev_rx_ind);
rt_hw_interrupt_enable(int_lvl);
}
rt_thread_delete(at_client);
rt_sem_detach(&client_rx_notice);
rt_ringbuffer_destroy(client_rx_fifo);
}
else
{