diff options
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/speed.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tcgetattr.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tcsetattr.c | 9 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/speed.c b/sysdeps/unix/sysv/linux/speed.c index a6a03a0c63..90104e5cc5 100644 --- a/sysdeps/unix/sysv/linux/speed.c +++ b/sysdeps/unix/sysv/linux/speed.c @@ -1,5 +1,6 @@ /* `struct termios' speed frobnication functions. Linux version. - Copyright (C) 1991,92,93,95,96,97,98,2000,02 Free Software Foundation, Inc. + Copyright (C) 1991,1992,1993,1995,1996,1997,1998,2000,2002,2003 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -66,6 +67,7 @@ cfsetospeed (termios_p, speed) return -1; } + termios_p->c_ospeed = speed; termios_p->c_cflag &= ~(CBAUD | CBAUDEX); termios_p->c_cflag |= speed; @@ -90,6 +92,7 @@ cfsetispeed (termios_p, speed) return -1; } + termios_p->c_ispeed = speed; if (speed == 0) termios_p->c_iflag |= IBAUD0; else diff --git a/sysdeps/unix/sysv/linux/tcgetattr.c b/sysdeps/unix/sysv/linux/tcgetattr.c index 8a6fd59cd4..25b5b51fbb 100644 --- a/sysdeps/unix/sysv/linux/tcgetattr.c +++ b/sysdeps/unix/sysv/linux/tcgetattr.c @@ -47,9 +47,13 @@ __tcgetattr (fd, termios_p) termios_p->c_line = k_termios.c_line; #ifdef _HAVE_C_ISPEED termios_p->c_ispeed = k_termios.c_ispeed; +#else + termios_p->c_ispeed = k_termios.c_cflag & (CBAUD | CBAUDEX); #endif #ifdef _HAVE_C_OSPEED termios_p->c_ospeed = k_termios.c_ospeed; +#else + termios_p->c_ospeed = k_termios.c_cflag & (CBAUD | CBAUDEX); #endif if (sizeof (cc_t) == 1 || _POSIX_VDISABLE == 0 || (unsigned char) _POSIX_VDISABLE == (unsigned char) -1) diff --git a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c index 0b0189485a..6005119733 100644 --- a/sysdeps/unix/sysv/linux/tcsetattr.c +++ b/sysdeps/unix/sysv/linux/tcsetattr.c @@ -37,14 +37,7 @@ We use an unused bit in the `c_iflag' field to keep track of this use of `cfsetispeed'. The value here must correspond to the one used in `speed.c'. */ -#if !defined _HAVE_C_ISPEED || !defined _HAVE_C_OSPEED -# define IBAUD0 020000000000 -#else -/* If we have separate values for input and output speed don't bother - with this. Define the value as zero so the compiler sees we don't - have to do the AND below. */ -# define IBAUD0 0 -#endif +#define IBAUD0 020000000000 /* Set the state of FD to *TERMIOS_P. */ |