diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-17 20:26:09 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-12-17 20:26:09 +0000 |
| commit | 27643e03366da4908a5aad0c5d0b272909eb78de (patch) | |
| tree | a6d8c9b7274b801845dcbd3bec95476c28b5dd00 /cpukit/libcsupport | |
| parent | 2009-12-17 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-27643e03366da4908a5aad0c5d0b272909eb78de.tar.bz2 | |
2009-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/termios.c, libfs/src/dosfs/msdos_format.c,
libfs/src/nfsclient/src/nfs.c, libfs/src/pipe/fifo.c,
libnetworking/lib/rtems_bsdnet_ntp.c, libnetworking/lib/tftpDriver.c,
libnetworking/rtems/rtems_glue.c, libnetworking/rtems/rtems_select.c:
Eliminate uses of deprecated rtems_clock_get() and replace with
properly typed routine.
Diffstat (limited to 'cpukit/libcsupport')
| -rw-r--r-- | cpukit/libcsupport/src/termios.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index 51f3ac8cce..22811b64e8 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -553,9 +553,8 @@ rtems_termios_ioctl (void *arg) tty->rawInBufSemaphoreFirstTimeout = RTEMS_NO_TIMEOUT; } else { - rtems_interval ticksPerSecond; - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticksPerSecond); - tty->vtimeTicks = tty->termios.c_cc[VTIME] * ticksPerSecond / 10; + tty->vtimeTicks = tty->termios.c_cc[VTIME] * + rtems_clock_get_ticks_per_second() / 10; if (tty->termios.c_cc[VTIME]) { tty->rawInBufSemaphoreOptions = RTEMS_WAIT; tty->rawInBufSemaphoreTimeout = tty->vtimeTicks; @@ -977,13 +976,13 @@ fillBufferPoll (struct rtems_termios_tty *tty) else { rtems_interval then, now; if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); + then = rtems_clock_get_ticks_since_boot(); for (;;) { n = (*tty->device.pollRead)(tty->minor); if (n < 0) { if (tty->termios.c_cc[VMIN]) { if (tty->termios.c_cc[VTIME] && tty->ccount) { - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now); + now = rtems_clock_get_ticks_since_boot(); if ((now - then) > tty->vtimeTicks) { break; } @@ -992,7 +991,7 @@ fillBufferPoll (struct rtems_termios_tty *tty) else { if (!tty->termios.c_cc[VTIME]) break; - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now); + now = rtems_clock_get_ticks_since_boot(); if ((now - then) > tty->vtimeTicks) { break; } @@ -1004,7 +1003,7 @@ fillBufferPoll (struct rtems_termios_tty *tty) if (tty->ccount >= tty->termios.c_cc[VMIN]) break; if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) - rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); + then = rtems_clock_get_ticks_since_boot(); } } } |