2005-09-08 Christopher Faylor <cgf@timesys.com>
+ * fhandler_serial.cc (fhandler_serial::tcgetattr): Just zero c_cflag
+ here rather than clearing CBAUD after the fact.
+
+2005-09-08 Christopher Faylor <cgf@timesys.com>
+
* fhandler_serial.cc (fhandler_serial::ioctl): Always return 0 for
window size.
* termios.cc (tcgetattr): Clear out baud part of c_cflag since it is
/* for safety */
memset (t, 0, sizeof (*t));
+ t->c_cflag = 0;
/* -------------- Baud rate ------------------ */
switch (state.BaudRate)
{
case CBR_110:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B110;
+ t->c_ospeed = t->c_ispeed = B110;
break;
case CBR_300:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B300;
+ t->c_ospeed = t->c_ispeed = B300;
break;
case CBR_600:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B600;
+ t->c_ospeed = t->c_ispeed = B600;
break;
case CBR_1200:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B1200;
+ t->c_ospeed = t->c_ispeed = B1200;
break;
case CBR_2400:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B2400;
+ t->c_ospeed = t->c_ispeed = B2400;
break;
case CBR_4800:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B4800;
+ t->c_ospeed = t->c_ispeed = B4800;
break;
case CBR_9600:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B9600;
+ t->c_ospeed = t->c_ispeed = B9600;
break;
case CBR_19200:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B19200;
+ t->c_ospeed = t->c_ispeed = B19200;
break;
case CBR_38400:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B38400;
+ t->c_ospeed = t->c_ispeed = B38400;
break;
case CBR_57600:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B57600;
+ t->c_ospeed = t->c_ispeed = B57600;
break;
case CBR_115200:
- t->c_cflag = t->c_ospeed = t->c_ispeed = B115200;
+ t->c_ospeed = t->c_ispeed = B115200;
break;
case 230400: /* CBR_230400 - not defined */
- t->c_cflag = t->c_ospeed = t->c_ispeed = B230400;
+ t->c_ospeed = t->c_ispeed = B230400;
break;
default:
/* Unsupported baud rate! */
else if (!cfd->is_tty ())
set_errno (ENOTTY);
else if ((res = cfd->tcgetattr (t)) == 0)
- {
- t->c_cflag &= ~CBAUD;
- __toapp_termios (in_t, t);
- }
+ __toapp_termios (in_t, t);
if (res)
termios_printf ("%d = tcgetattr (%d, %p)", res, fd, in_t);