dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix the handling of FIONREAD/FIONWRITE; thanks Tridge.

This commit is contained in:
px4dev 2013-01-04 21:28:26 -08:00
parent e787fa5bce
commit 91ca80e634
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nuttx/drivers/serial/serial.c
View File

@ -660,9 +660,9 @@ static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int ret = dev->ops->ioctl(filep, cmd, arg); int ret = dev->ops->ioctl(filep, cmd, arg);
/* Append any higher level TTY flags */ /* If the low-level handler didn't handle the call, see if we can handle it here */
if (ret == OK) if (ret == -ENOTTY)
{ {
switch (cmd) switch (cmd)
{ {
@ -686,6 +686,9 @@ static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
irqrestore(state); irqrestore(state);
*(int *)arg = count; *(int *)arg = count;
ret = 0;
break;
} }
case FIONWRITE: case FIONWRITE:
@ -695,7 +698,7 @@ static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
/* determine the number of bytes free in the buffer */ /* determine the number of bytes free in the buffer */
if (dev->xmit.head <= dev->xmit.tail) if (dev->xmit.head < dev->xmit.tail)
{ {
count = dev->xmit.tail - dev->xmit.head - 1; count = dev->xmit.tail - dev->xmit.head - 1;
} }
@ -707,8 +710,19 @@ static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
irqrestore(state); irqrestore(state);
*(int *)arg = count; *(int *)arg = count;
} ret = 0;
break;
}
}
}
/* Append any higher level TTY flags */
else if (ret == OK)
{
switch (cmd)
{
#ifdef CONFIG_SERIAL_TERMIOS #ifdef CONFIG_SERIAL_TERMIOS
case TCGETS: case TCGETS:
{ {