chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1040 from armink/fix_serial_reopen

Browse Source 
[DeviceDriver][Serial] Fix serial open flag lost when device reopen.
This commit is contained in:
Bernard Xiong 2017-11-28 13:43:57 +08:00 committed by GitHub
commit 128c184554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -641,6 +641,13 @@ static rt_err_t rt_serial_open(struct rt_device *dev, rt_uint16_t oflag)
serial->serial_rx = RT_NULL; serial->serial_rx = RT_NULL;
} }
} }
else
{
if (oflag & RT_DEVICE_FLAG_DMA_RX)
dev->open_flag |= RT_DEVICE_FLAG_DMA_RX;
else if (oflag & RT_DEVICE_FLAG_INT_RX)
dev->open_flag |= RT_DEVICE_FLAG_INT_RX;
}
if (serial->serial_tx == RT_NULL) if (serial->serial_tx == RT_NULL)
{ {
@ -676,6 +683,13 @@ static rt_err_t rt_serial_open(struct rt_device *dev, rt_uint16_t oflag)
serial->serial_tx = RT_NULL; serial->serial_tx = RT_NULL;
} }
} }
else
{
if (oflag & RT_DEVICE_FLAG_DMA_TX)
dev->open_flag |= RT_DEVICE_FLAG_DMA_TX;
else if (oflag & RT_DEVICE_FLAG_INT_TX)
dev->open_flag |= RT_DEVICE_FLAG_INT_TX;
}
/* set stream flag */ /* set stream flag */
dev->open_flag |= stream_flag; dev->open_flag |= stream_flag;