sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/usbdev: Fix some bad conditional logic.

Browse Source
This commit is contained in:
Gregory Nutt 2017-09-23 12:57:20 -06:00
parent 2e69e22af3
commit 3bc21a3973
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/usbdev/cdcacm.c
View File

@ -2162,22 +2162,33 @@ static int cdcuart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
priv->iflow = iflow; priv->iflow = iflow;
/* If flow control has been disabled, then we will need to /* Check if flow control has been disabled. */
* make sure that DSR is set.
*/
if (!iflow && (priv->serialstate & CDCACM_UART_DSR) == 0) if (!iflow)
{ {
priv->serialstate |= (CDCACM_UART_DSR | CDCACM_UART_DCD); /* Flow control has been disabled. We need to make sure
ret = cdcacm_serialstate(priv); * that DSR is set unconditionally.
*/
if ((priv->serialstate & CDCACM_UART_DSR) == 0)
{
priv->serialstate |= (CDCACM_UART_DSR | CDCACM_UART_DCD);
ret = cdcacm_serialstate(priv);
}
} }
/* If flow control has been enabled and the RX buffer is already /* Flow control has been enabled. If the RX buffer is already
* (nearly) full, the we need to make sure the DSR is clear. * (nearly) full, the we need to make sure the DSR is clear.
*
* NOTE: Here we assume that DSR is set so we don't check its
* current value nor to we handle the case where we would set
* DSR because the RX buffer is (nearly) empty!
*/ */
else if (priv->upper) else if (priv->upper)
{ {
/* In this transition, DSR should already be set */
priv->serialstate &= ~CDCACM_UART_DSR; priv->serialstate &= ~CDCACM_UART_DSR;
priv->serialstate |= CDCACM_UART_DCD; priv->serialstate |= CDCACM_UART_DCD;
ret = cdcacm_serialstate(priv); ret = cdcacm_serialstate(priv);