summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-02-23 09:12:36 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-02-28 09:53:21 +0100
commit35a3d81581954caedfbfcac1fb207d82a42b384b (patch)
tree12a0e4e2166225582acbbc24a1ee442e124e9d03 /cpukit
parent17f81ee3cb41764d34c2f09a2b92c40a41f78841 (diff)
downloadrtems-35a3d81581954caedfbfcac1fb207d82a42b384b.tar.bz2
termios: Simplify rtems_termios_read_tty()
Remove dead code. Update #2914.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libcsupport/src/termios.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
index d12f9c48d5..54b0121aee 100644
--- a/cpukit/libcsupport/src/termios.c
+++ b/cpukit/libcsupport/src/termios.c
@@ -1402,7 +1402,7 @@ siproc (unsigned char c, struct rtems_termios_tty *tty)
/*
* Fill the input buffer by polling the device
*/
-static rtems_status_code
+static void
fillBufferPoll (struct rtems_termios_tty *tty)
{
int n;
@@ -1449,13 +1449,12 @@ fillBufferPoll (struct rtems_termios_tty *tty)
}
}
}
- return RTEMS_SUCCESSFUL;
}
/*
* Fill the input buffer from the raw input queue
*/
-static rtems_status_code
+static void
fillBufferQueue (struct rtems_termios_tty *tty)
{
rtems_interval timeout = tty->rawInBufSemaphoreFirstTimeout;
@@ -1517,7 +1516,6 @@ fillBufferQueue (struct rtems_termios_tty *tty)
break;
}
}
- return RTEMS_SUCCESSFUL;
}
rtems_status_code
@@ -1544,12 +1542,9 @@ rtems_termios_read (void *arg)
tty->cindex = tty->ccount = 0;
tty->read_start_column = tty->column;
if (tty->handler.poll_read != NULL && tty->handler.mode == TERMIOS_POLLED)
- sc = fillBufferPoll (tty);
+ fillBufferPoll (tty);
else
- sc = fillBufferQueue (tty);
-
- if (sc != RTEMS_SUCCESSFUL)
- tty->cindex = tty->ccount = 0;
+ fillBufferQueue (tty);
}
while (count && (tty->cindex < tty->ccount)) {
*buffer++ = tty->cbuf[tty->cindex++];