USB: belkin_sa: clean up for new style termios and speed handling, plus style
A tester with actual hardware would be useful Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
fcf9e55e06
commit
3ec466b496
1 changed files with 15 additions and 20 deletions
|
@ -350,14 +350,12 @@ static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios
|
||||||
unsigned long control_state;
|
unsigned long control_state;
|
||||||
int bad_flow_control;
|
int bad_flow_control;
|
||||||
speed_t baud;
|
speed_t baud;
|
||||||
|
struct ktermios *termios = port->tty->termios;
|
||||||
|
|
||||||
if ((!port->tty) || (!port->tty->termios)) {
|
iflag = termios->c_iflag;
|
||||||
dbg ("%s - no tty or termios structure", __FUNCTION__);
|
cflag = termios->c_cflag;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
iflag = port->tty->termios->c_iflag;
|
termios->c_cflag &= ~CMSPAR;
|
||||||
cflag = port->tty->termios->c_cflag;
|
|
||||||
|
|
||||||
/* get a local copy of the current port settings */
|
/* get a local copy of the current port settings */
|
||||||
spin_lock_irqsave(&priv->lock, flags);
|
spin_lock_irqsave(&priv->lock, flags);
|
||||||
|
@ -369,33 +367,30 @@ static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios
|
||||||
old_cflag = old_termios->c_cflag;
|
old_cflag = old_termios->c_cflag;
|
||||||
|
|
||||||
/* Set the baud rate */
|
/* Set the baud rate */
|
||||||
if( (cflag&CBAUD) != (old_cflag&CBAUD) ) {
|
if ((cflag & CBAUD) != (old_cflag & CBAUD)) {
|
||||||
/* reassert DTR and (maybe) RTS on transition from B0 */
|
/* reassert DTR and (maybe) RTS on transition from B0 */
|
||||||
if( (old_cflag&CBAUD) == B0 ) {
|
if( (old_cflag&CBAUD) == B0 ) {
|
||||||
control_state |= (TIOCM_DTR|TIOCM_RTS);
|
control_state |= (TIOCM_DTR|TIOCM_RTS);
|
||||||
if (BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, 1) < 0)
|
if (BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, 1) < 0)
|
||||||
err("Set DTR error");
|
err("Set DTR error");
|
||||||
/* don't set RTS if using hardware flow control */
|
/* don't set RTS if using hardware flow control */
|
||||||
if (!(old_cflag&CRTSCTS) )
|
if (!(old_cflag & CRTSCTS))
|
||||||
if (BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, 1) < 0)
|
if (BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, 1) < 0)
|
||||||
err("Set RTS error");
|
err("Set RTS error");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
baud = tty_get_baud_rate(port->tty);
|
baud = tty_get_baud_rate(port->tty);
|
||||||
if (baud == 0) {
|
if (baud) {
|
||||||
dbg("%s - tty_get_baud_rate says 0 baud", __FUNCTION__);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
urb_value = BELKIN_SA_BAUD(baud);
|
urb_value = BELKIN_SA_BAUD(baud);
|
||||||
/* Clip to maximum speed */
|
/* Clip to maximum speed */
|
||||||
if (urb_value == 0)
|
if (urb_value == 0)
|
||||||
urb_value = 1;
|
urb_value = 1;
|
||||||
/* Turn it back into a resulting real baud rate */
|
/* Turn it back into a resulting real baud rate */
|
||||||
baud = BELKIN_SA_BAUD(urb_value);
|
baud = BELKIN_SA_BAUD(urb_value);
|
||||||
/* FIXME: Once the tty updates are done then push this back to the tty */
|
|
||||||
|
|
||||||
if ((cflag & CBAUD) != B0 ) {
|
/* Report the actual baud rate back to the caller */
|
||||||
|
tty_encode_baud_rate(port->tty, baud, baud);
|
||||||
if (BSA_USB_CMD(BELKIN_SA_SET_BAUDRATE_REQUEST, urb_value) < 0)
|
if (BSA_USB_CMD(BELKIN_SA_SET_BAUDRATE_REQUEST, urb_value) < 0)
|
||||||
err("Set baudrate error");
|
err("Set baudrate error");
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Reference in a new issue