From a94b2ac0aaa1026e421389745d473e93fe56218f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 7 Dec 1998 16:14:02 +0000 Subject: Update. * sysdeps/unix/sysv/linux/speed.c (IBAUD0): New definition. Bit set in c_iflag if cfsetispeed is call with SPEED set to zero. (cfgetispeed): Return zero if prior if IBAUD0 is set. (cfsetospeed): Clear IBAUD0 bit. (cfgetispeed): Set IBAUD0 bit if necessary. * sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Clear the IBAUD0 bit in c_iflag when making the system call. Work around a Linux kernel bug which silently changes the PARENB/CREAD/CSIZE bits in c_cflag on pty. Based on a patch by H.J. Lu . * Makeconfig (link-libc-static): Don't use link-libc since this includes the shared object. Use gnulib only. --- sysdeps/unix/sysv/linux/speed.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'sysdeps/unix/sysv/linux/speed.c') diff --git a/sysdeps/unix/sysv/linux/speed.c b/sysdeps/unix/sysv/linux/speed.c index a0aefd805a..5a23e53fc5 100644 --- a/sysdeps/unix/sysv/linux/speed.c +++ b/sysdeps/unix/sysv/linux/speed.c @@ -22,6 +22,17 @@ #include +/* This is a gross hack around a kernel bug. If the cfsetispeed functions + is called with the SPEED argument set to zero this means use the same + speed as for output. But we don't have independent input and output + speeds and therefore cannot record this. + + 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 `tcsetattr.c'. */ +#define IBAUD0 020000000000 + + /* Return the output baud rate stored in *TERMIOS_P. */ speed_t cfgetospeed (termios_p) @@ -31,8 +42,16 @@ cfgetospeed (termios_p) } /* Return the input baud rate stored in *TERMIOS_P. - For Linux there is no difference between input and output speed. */ -strong_alias (cfgetospeed, cfgetispeed); + Although for Linux there is no difference between input and output + speed, the numerical 0 is a special case for the input baud rate. It + should set the input baud rate to the output baud rate. */ +speed_t +cfgetispeed (termios_p) + const struct termios *termios_p; +{ + return ((termios_p->c_iflag & IBAUD0) + ? 0 : termios_p->c_cflag & (CBAUD | CBAUDEX)); +} /* Set the output baud rate stored in *TERMIOS_P to SPEED. */ int @@ -47,6 +66,7 @@ cfsetospeed (termios_p, speed) return -1; } + termios_p->c_iflag &= ~IBAUD0; termios_p->c_cflag &= ~(CBAUD | CBAUDEX); termios_p->c_cflag |= speed; @@ -69,8 +89,11 @@ cfsetispeed (termios_p, speed) return -1; } - if (speed != 0) + if (speed == 0) + termios_p->c_iflag |= IBAUD0; + else { + termios_p->c_iflag &= ~IBAUD0; termios_p->c_cflag &= ~(CBAUD | CBAUDEX); termios_p->c_cflag |= speed; } -- cgit v1.2.3