libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2376 from loogg/mlw-fs 

解决_tc_flush可能引起的缓冲区冲突
This commit is contained in:
Bernard Xiong 2019-03-03 15:56:00 +08:00 committed by GitHub
parent f44b8b7bdf 8b18522cfd
commit aa7166df01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/drivers/serial/serial.c
View File

@ -882,6 +882,7 @@ static int _get_baudrate(speed_t speed)
static void _tc_flush(struct rt_serial_device *serial, int queue) static void _tc_flush(struct rt_serial_device *serial, int queue)
{ {
rt_base_t level;
int ch = -1; int ch = -1;
struct rt_serial_rx_fifo *rx_fifo = RT_NULL; struct rt_serial_rx_fifo *rx_fifo = RT_NULL;
struct rt_device *device = RT_NULL; struct rt_device *device = RT_NULL;
@ -901,10 +902,12 @@ static void _tc_flush(struct rt_serial_device *serial, int queue)
if((device->open_flag & RT_DEVICE_FLAG_INT_RX) || (device->open_flag & RT_DEVICE_FLAG_DMA_RX)) if((device->open_flag & RT_DEVICE_FLAG_INT_RX) || (device->open_flag & RT_DEVICE_FLAG_DMA_RX))
{ {
RT_ASSERT(RT_NULL != rx_fifo); RT_ASSERT(RT_NULL != rx_fifo);
level = rt_hw_interrupt_disable();
rt_memset(rx_fifo->buffer, 0, serial->config.bufsz); rt_memset(rx_fifo->buffer, 0, serial->config.bufsz);
rx_fifo->put_index = 0; rx_fifo->put_index = 0;
rx_fifo->get_index = 0; rx_fifo->get_index = 0;
rx_fifo->is_full = RT_FALSE; rx_fifo->is_full = RT_FALSE;
rt_hw_interrupt_enable(level);
} }
else else
{ {