RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

termios: Change tty_rcvwakeup to bool

Browse Source 
Optimize callout invocation check.
This commit is contained in:
Sebastian Huber
2017-02-23 09:38:54 +01:00
parent 9f69ac2a9d
commit 49d8f653fb
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/libcsupport/include/rtems/termiostypes.h
View File

@@ -377,7 +377,7 @@ typedef struct rtems_termios_tty {
*/ */
struct ttywakeup tty_snd; struct ttywakeup tty_snd;
struct ttywakeup tty_rcv; struct ttywakeup tty_rcv;
int tty_rcvwakeup; bool tty_rcvwakeup;
/** /**
* @brief Corresponding device node. * @brief Corresponding device node.

16
cpukit/libcsupport/src/termios.c
View File

@@ -440,7 +440,7 @@ rtems_termios_open_tty(
tty->tty_snd.sw_arg = NULL; tty->tty_snd.sw_arg = NULL;
tty->tty_rcv.sw_pfn = NULL; tty->tty_rcv.sw_pfn = NULL;
tty->tty_rcv.sw_arg = NULL; tty->tty_rcv.sw_arg = NULL;
tty->tty_rcvwakeup = 0; tty->tty_rcvwakeup = false;
tty->minor = minor; tty->minor = minor;
tty->major = major; tty->major = major;
@@ -1528,7 +1528,7 @@ rtems_termios_read_tty (struct rtems_termios_tty *tty, char *buffer,
*buffer++ = tty->cbuf[tty->cindex++]; *buffer++ = tty->cbuf[tty->cindex++];
count--; count--;
} }
tty->tty_rcvwakeup = 0; tty->tty_rcvwakeup = false;
return initial_count - count; return initial_count - count;
} }
@@ -1545,7 +1545,7 @@ rtems_termios_read (void *arg)
if (rtems_termios_linesw[tty->t_line].l_read != NULL) { if (rtems_termios_linesw[tty->t_line].l_read != NULL) {
sc = rtems_termios_linesw[tty->t_line].l_read(tty,args); sc = rtems_termios_linesw[tty->t_line].l_read(tty,args);
tty->tty_rcvwakeup = 0; tty->tty_rcvwakeup = false;
rtems_semaphore_release (tty->isem); rtems_semaphore_release (tty->isem);
return sc; return sc;
} }
@@ -1593,9 +1593,9 @@ rtems_termios_enqueue_raw_characters (void *ttyp, const char *buf, int len)
/* /*
* check to see if rcv wakeup callback was set * 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_rcv.sw_pfn)(&tty->termios, tty->tty_rcv.sw_arg);
tty->tty_rcvwakeup = 1;
} }
return 0; 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 * 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_rcv.sw_pfn)(&tty->termios, tty->tty_rcv.sw_arg);
tty->tty_rcvwakeup = 1;
} }
} else { } else {
++dropped; ++dropped;
@@ -2007,7 +2007,7 @@ rtems_termios_imfs_read (rtems_libio_t *iop, void *buffer, size_t count)
args.flags = iop->flags; args.flags = iop->flags;
sc = rtems_termios_linesw[tty->t_line].l_read (tty, &args); sc = rtems_termios_linesw[tty->t_line].l_read (tty, &args);
tty->tty_rcvwakeup = 0; tty->tty_rcvwakeup = false;
rtems_semaphore_release (tty->isem); rtems_semaphore_release (tty->isem);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {