diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-02-23 09:38:54 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-02-28 08:51:31 +0100 |
| commit | 49d8f653fba479dcd6a09ff42400696099a14bc5 (patch) | |
| tree | 077e3c984cffbdc652013d3ba4fc7e3b53d9ad8a /cpukit/libcsupport | |
| parent | termios: Ignore carriage return early if desired (diff) | |
| download | rtems-49d8f653fba479dcd6a09ff42400696099a14bc5.tar.bz2 | |
termios: Change tty_rcvwakeup to bool
Optimize callout invocation check.
Diffstat (limited to 'cpukit/libcsupport')
| -rw-r--r-- | cpukit/libcsupport/include/rtems/termiostypes.h | 2 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/termios.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/libcsupport/include/rtems/termiostypes.h index 2dcaa16abd..5240b85106 100644 --- a/cpukit/libcsupport/include/rtems/termiostypes.h +++ b/cpukit/libcsupport/include/rtems/termiostypes.h @@ -377,7 +377,7 @@ typedef struct rtems_termios_tty { */ struct ttywakeup tty_snd; struct ttywakeup tty_rcv; - int tty_rcvwakeup; + bool tty_rcvwakeup; /** * @brief Corresponding device node. diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index c1d6cd5297..dccdfd722d 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -440,7 +440,7 @@ rtems_termios_open_tty( tty->tty_snd.sw_arg = NULL; tty->tty_rcv.sw_pfn = NULL; tty->tty_rcv.sw_arg = NULL; - tty->tty_rcvwakeup = 0; + tty->tty_rcvwakeup = false; tty->minor = minor; tty->major = major; @@ -1528,7 +1528,7 @@ rtems_termios_read_tty (struct rtems_termios_tty *tty, char *buffer, *buffer++ = tty->cbuf[tty->cindex++]; count--; } - tty->tty_rcvwakeup = 0; + tty->tty_rcvwakeup = false; return initial_count - count; } @@ -1545,7 +1545,7 @@ rtems_termios_read (void *arg) if (rtems_termios_linesw[tty->t_line].l_read != NULL) { sc = rtems_termios_linesw[tty->t_line].l_read(tty,args); - tty->tty_rcvwakeup = 0; + tty->tty_rcvwakeup = false; rtems_semaphore_release (tty->isem); return sc; } @@ -1593,10 +1593,10 @@ rtems_termios_enqueue_raw_characters (void *ttyp, const char *buf, int len) /* * check to see if rcv wakeup callback was set */ - if (( !tty->tty_rcvwakeup ) && ( tty->tty_rcv.sw_pfn != NULL )) { + if (tty->tty_rcv.sw_pfn != NULL && !tty->tty_rcvwakeup) { + tty->tty_rcvwakeup = true; (*tty->tty_rcv.sw_pfn)(&tty->termios, tty->tty_rcv.sw_arg); - tty->tty_rcvwakeup = 1; - } + } return 0; } @@ -1689,9 +1689,9 @@ rtems_termios_enqueue_raw_characters (void *ttyp, const char *buf, int len) /* * check to see if rcv wakeup callback was set */ - if (( !tty->tty_rcvwakeup ) && ( tty->tty_rcv.sw_pfn != NULL )) { + if (tty->tty_rcv.sw_pfn != NULL && !tty->tty_rcvwakeup) { + tty->tty_rcvwakeup = true; (*tty->tty_rcv.sw_pfn)(&tty->termios, tty->tty_rcv.sw_arg); - tty->tty_rcvwakeup = 1; } } else { ++dropped; @@ -2007,7 +2007,7 @@ rtems_termios_imfs_read (rtems_libio_t *iop, void *buffer, size_t count) args.flags = iop->flags; sc = rtems_termios_linesw[tty->t_line].l_read (tty, &args); - tty->tty_rcvwakeup = 0; + tty->tty_rcvwakeup = false; rtems_semaphore_release (tty->isem); if (sc != RTEMS_SUCCESSFUL) { |