解决_tc_flush可能引起的缓冲区冲突

loogg · loogg · commit 8b18522cfd3f · 2019-03-03T14:12:01.000+08:00
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c
@@ -882,6 +882,7 @@ static int _get_baudrate(speed_t speed)
 
 static void _tc_flush(struct rt_serial_device *serial, int queue)
 {
+    rt_base_t level;
     int ch = -1;
     struct rt_serial_rx_fifo *rx_fifo = 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))
             {
                 RT_ASSERT(RT_NULL != rx_fifo);
+                level = rt_hw_interrupt_disable();
                 rt_memset(rx_fifo->buffer, 0, serial->config.bufsz);
                 rx_fifo->put_index = 0;
                 rx_fifo->get_index = 0;
                 rx_fifo->is_full = RT_FALSE;
+                rt_hw_interrupt_enable(level);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -882,6 +882,7 @@ static int _get_baudrate(speed_t speed)`
`882`	`882`
`883`	`883`	`static void _tc_flush(struct rt_serial_device *serial, int queue)`
`884`	`884`	`{`
	`885`	`+ rt_base_t level;`
`885`	`886`	`int ch = -1;`
`886`	`887`	`struct rt_serial_rx_fifo *rx_fifo = RT_NULL;`
`887`	`888`	`struct rt_device *device = RT_NULL;`
`@@ -901,10 +902,12 @@ static void _tc_flush(struct rt_serial_device *serial, int queue)`
`901`	`902`	`if((device->open_flag & RT_DEVICE_FLAG_INT_RX) \|\| (device->open_flag & RT_DEVICE_FLAG_DMA_RX))`
`902`	`903`	`{`
`903`	`904`	`RT_ASSERT(RT_NULL != rx_fifo);`
	`905`	`+ level = rt_hw_interrupt_disable();`
`904`	`906`	`rt_memset(rx_fifo->buffer, 0, serial->config.bufsz);`
`905`	`907`	`rx_fifo->put_index = 0;`
`906`	`908`	`rx_fifo->get_index = 0;`
`907`	`909`	`rx_fifo->is_full = RT_FALSE;`
	`910`	`+ rt_hw_interrupt_enable(level);`
`908`	`911`	`}`
`909`	`912`	`else`
`910`	`913`	`{`