Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

drivers/serial/serial.c: Don't overwrite nwritten unconditionally on UART write failure.

Browse Source
This commit is contained in:
Xiang Xiao
2018-08-26 09:56:02 -06:00
committed by Gregory Nutt
parent c8df5f3df3
commit 4465cccdbd
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/serial/serial.c
+3 -8
View File
@@ -1155,19 +1155,14 @@ static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer,
if ((ch == '\n') && (dev->tc_oflag & (ONLCR | ONLRET)) != 0) if ((ch == '\n') && (dev->tc_oflag & (ONLCR | ONLRET)) != 0)
{ {
ret = uart_putxmitchar(dev, '\r', oktoblock); ret = uart_putxmitchar(dev, '\r', oktoblock);
if (ret < 0)
{
nwritten = ret;
break;
}
} }
/* Specifically not handled: /* Specifically not handled:
* *
* OXTABS - primarily a full-screen terminal optimisation * OXTABS - primarily a full-screen terminal optimization
* ONOEOT - Unix interoperability hack * ONOEOT - Unix interoperability hack
* OLCUC - Not specified by POSIX * OLCUC - Not specified by POSIX
* ONOCR - low-speed interactive optimisation * ONOCR - low-speed interactive optimization
*/ */
} }
@@ -1182,7 +1177,7 @@ static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer,
/* Put the character into the transmit buffer */ /* Put the character into the transmit buffer */
if (ret == OK) if (ret >= 0)
{ {
ret = uart_putxmitchar(dev, ch, oktoblock); ret = uart_putxmitchar(dev, ch, oktoblock);
} }