USB-serial updates for v4.9-rc1
More clean ups, including a second set of changes from Mathieu as part of a major overhaul of the ti_usb_3410_5052 driver. Signed-off-by: Johan Hovold <johan@kernel.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJX3ArrAAoJEEEN5E/e4bSVcTcP/0wT1GVgq9h25/9D5hBD00MV FBywygEzdvnLntWUSb9s8s2OYkBGO79zTpAVFcI6mLVf4lszGdAnZQPv2layr+oX EHJgxT3nGoBtl23I1gusBNwLNCjf7aaEAeRXXxI2EKpx5cdC3Qr07cgo0BIiCkvx hZwGtmHZvLgz3Nl847w6mdpcp/X0x9h6G3k6/tjXvVUipeGgoyZZ42uXxf1K/bT9 xpswLr/2cq4O0JH+4HHEK5Ls3Oyo9z00QmW8tX1xlUx+D09xPFh7AVyRVBxD+vos C1ouJpVbvXcjTcdB7f4v+C/GljnGIHC7nXZoGPvMEnNjVz5iQ27IStAmks6KzTC+ hwTf4d2tkX8lYstOwwAaInmnmLSgB8jgw/Lv9EfuZpZ7tWSj/JP/7priKiuaY5sH qLwpSg0fRZqGxzytQiTPTvDKxAgawnvuSLeU12v17hUqDsfBnqE1aJu4bLRZN2g3 BXd8n9RCn7HhV7Zz0ESLIkidnbvjoPyTuLt3CAu38LT2+YQ33BeHROk+/KqUwO/p Nt0Sg1V8jF5zoUCxZWTrc0R3fLT3GQ/nAD1cxVZvFnrPz4lH8wigpXdoHMhyN4on di6Gw0JQZpZKVI8j3xlOLwxu4i7o53jfIyRx1o97Tone8og2j4XgM93TjcQDy2M0 4dnSIunZjiiXcbad1uWa =4c1M -----END PGP SIGNATURE----- Merge tag 'usb-serial-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next Johan writes: USB-serial updates for v4.9-rc1 More clean ups, including a second set of changes from Mathieu as part of a major overhaul of the ti_usb_3410_5052 driver. Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Greg Kroah-Hartman
commit
eddde28895
|
|
@ -30,12 +30,12 @@
|
|||
#include <linux/usb/ezusb.h>
|
||||
|
||||
/* make a simple define to handle if we are compiling keyspan_pda or xircom support */
|
||||
#if defined(CONFIG_USB_SERIAL_KEYSPAN_PDA) || defined(CONFIG_USB_SERIAL_KEYSPAN_PDA_MODULE)
|
||||
#if IS_ENABLED(CONFIG_USB_SERIAL_KEYSPAN_PDA)
|
||||
#define KEYSPAN
|
||||
#else
|
||||
#undef KEYSPAN
|
||||
#endif
|
||||
#if defined(CONFIG_USB_SERIAL_XIRCOM) || defined(CONFIG_USB_SERIAL_XIRCOM_MODULE)
|
||||
#if IS_ENABLED(CONFIG_USB_SERIAL_XIRCOM)
|
||||
#define XIRCOM
|
||||
#else
|
||||
#undef XIRCOM
|
||||
|
|
|
|||
|
|
@ -179,23 +179,23 @@
|
|||
|
||||
/* Config struct */
|
||||
struct ti_uart_config {
|
||||
__u16 wBaudRate;
|
||||
__u16 wFlags;
|
||||
__u8 bDataBits;
|
||||
__u8 bParity;
|
||||
__u8 bStopBits;
|
||||
__be16 wBaudRate;
|
||||
__be16 wFlags;
|
||||
u8 bDataBits;
|
||||
u8 bParity;
|
||||
u8 bStopBits;
|
||||
char cXon;
|
||||
char cXoff;
|
||||
__u8 bUartMode;
|
||||
u8 bUartMode;
|
||||
} __packed;
|
||||
|
||||
/* Get port status */
|
||||
struct ti_port_status {
|
||||
__u8 bCmdCode;
|
||||
__u8 bModuleId;
|
||||
__u8 bErrorCode;
|
||||
__u8 bMSR;
|
||||
__u8 bLSR;
|
||||
u8 bCmdCode;
|
||||
u8 bModuleId;
|
||||
u8 bErrorCode;
|
||||
u8 bMSR;
|
||||
u8 bLSR;
|
||||
} __packed;
|
||||
|
||||
/* Purge modes */
|
||||
|
|
@ -218,12 +218,12 @@ struct ti_port_status {
|
|||
#define TI_RW_DATA_DOUBLE_WORD 0x04
|
||||
|
||||
struct ti_write_data_bytes {
|
||||
__u8 bAddrType;
|
||||
__u8 bDataType;
|
||||
__u8 bDataCounter;
|
||||
u8 bAddrType;
|
||||
u8 bDataType;
|
||||
u8 bDataCounter;
|
||||
__be16 wBaseAddrHi;
|
||||
__be16 wBaseAddrLo;
|
||||
__u8 bData[0];
|
||||
u8 bData[0];
|
||||
} __packed;
|
||||
|
||||
struct ti_read_data_request {
|
||||
|
|
@ -258,7 +258,7 @@ struct ti_interrupt {
|
|||
/* Firmware image header */
|
||||
struct ti_firmware_header {
|
||||
__le16 wLength;
|
||||
__u8 bCheckSum;
|
||||
u8 bCheckSum;
|
||||
} __packed;
|
||||
|
||||
/* UART addresses */
|
||||
|
|
@ -276,9 +276,6 @@ struct ti_firmware_header {
|
|||
|
||||
#define TI_DEFAULT_CLOSING_WAIT 4000 /* in .01 secs */
|
||||
|
||||
/* supported setserial flags */
|
||||
#define TI_SET_SERIAL_FLAGS 0
|
||||
|
||||
/* read urb states */
|
||||
#define TI_READ_URB_RUNNING 0
|
||||
#define TI_READ_URB_STOPPING 1
|
||||
|
|
@ -288,11 +285,10 @@ struct ti_firmware_header {
|
|||
|
||||
struct ti_port {
|
||||
int tp_is_open;
|
||||
__u8 tp_msr;
|
||||
__u8 tp_shadow_mcr;
|
||||
__u8 tp_uart_mode; /* 232 or 485 modes */
|
||||
u8 tp_msr;
|
||||
u8 tp_shadow_mcr;
|
||||
u8 tp_uart_mode; /* 232 or 485 modes */
|
||||
unsigned int tp_uart_base_addr;
|
||||
int tp_flags;
|
||||
struct ti_device *tp_tdev;
|
||||
struct usb_serial_port *tp_port;
|
||||
spinlock_t tp_lock;
|
||||
|
|
@ -306,7 +302,6 @@ struct ti_device {
|
|||
struct usb_serial *td_serial;
|
||||
int td_is_3410;
|
||||
bool td_rs485_only;
|
||||
int td_urb_error;
|
||||
};
|
||||
|
||||
static int ti_startup(struct usb_serial *serial);
|
||||
|
|
@ -343,7 +338,7 @@ static int ti_get_serial_info(struct ti_port *tport,
|
|||
struct serial_struct __user *ret_arg);
|
||||
static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport,
|
||||
struct serial_struct __user *new_arg);
|
||||
static void ti_handle_new_msr(struct ti_port *tport, __u8 msr);
|
||||
static void ti_handle_new_msr(struct ti_port *tport, u8 msr);
|
||||
|
||||
static void ti_stop_read(struct ti_port *tport, struct tty_struct *tty);
|
||||
static int ti_restart_read(struct ti_port *tport, struct tty_struct *tty);
|
||||
|
|
@ -354,7 +349,7 @@ static int ti_command_in_sync(struct ti_device *tdev, __u8 command,
|
|||
__u16 moduleid, __u16 value, __u8 *data, int size);
|
||||
|
||||
static int ti_write_byte(struct usb_serial_port *port, struct ti_device *tdev,
|
||||
unsigned long addr, __u8 mask, __u8 byte);
|
||||
unsigned long addr, u8 mask, u8 byte);
|
||||
|
||||
static int ti_download_firmware(struct ti_device *tdev);
|
||||
|
||||
|
|
@ -647,12 +642,11 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
struct urb *urb;
|
||||
int port_number;
|
||||
int status;
|
||||
__u16 open_settings = (__u8)(TI_PIPE_MODE_CONTINUOUS |
|
||||
TI_PIPE_TIMEOUT_ENABLE |
|
||||
(TI_TRANSFER_TIMEOUT << 2));
|
||||
u16 open_settings;
|
||||
|
||||
if (tport == NULL)
|
||||
return -ENODEV;
|
||||
open_settings = (TI_PIPE_MODE_CONTINUOUS |
|
||||
TI_PIPE_TIMEOUT_ENABLE |
|
||||
(TI_TRANSFER_TIMEOUT << 2));
|
||||
|
||||
dev = port->serial->dev;
|
||||
tdev = tport->tp_tdev;
|
||||
|
|
@ -686,7 +680,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
if (tty)
|
||||
ti_set_termios(tty, port, &tty->termios);
|
||||
|
||||
dev_dbg(&port->dev, "%s - sending TI_OPEN_PORT\n", __func__);
|
||||
status = ti_command_out_sync(tdev, TI_OPEN_PORT,
|
||||
(__u8)(TI_UART1_PORT + port_number), open_settings, NULL, 0);
|
||||
if (status) {
|
||||
|
|
@ -695,7 +688,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
goto unlink_int_urb;
|
||||
}
|
||||
|
||||
dev_dbg(&port->dev, "%s - sending TI_START_PORT\n", __func__);
|
||||
status = ti_command_out_sync(tdev, TI_START_PORT,
|
||||
(__u8)(TI_UART1_PORT + port_number), 0, NULL, 0);
|
||||
if (status) {
|
||||
|
|
@ -704,7 +696,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
goto unlink_int_urb;
|
||||
}
|
||||
|
||||
dev_dbg(&port->dev, "%s - sending TI_PURGE_PORT\n", __func__);
|
||||
status = ti_command_out_sync(tdev, TI_PURGE_PORT,
|
||||
(__u8)(TI_UART1_PORT + port_number), TI_PURGE_INPUT, NULL, 0);
|
||||
if (status) {
|
||||
|
|
@ -728,7 +719,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
if (tty)
|
||||
ti_set_termios(tty, port, &tty->termios);
|
||||
|
||||
dev_dbg(&port->dev, "%s - sending TI_OPEN_PORT (2)\n", __func__);
|
||||
status = ti_command_out_sync(tdev, TI_OPEN_PORT,
|
||||
(__u8)(TI_UART1_PORT + port_number), open_settings, NULL, 0);
|
||||
if (status) {
|
||||
|
|
@ -737,7 +727,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
goto unlink_int_urb;
|
||||
}
|
||||
|
||||
dev_dbg(&port->dev, "%s - sending TI_START_PORT (2)\n", __func__);
|
||||
status = ti_command_out_sync(tdev, TI_START_PORT,
|
||||
(__u8)(TI_UART1_PORT + port_number), 0, NULL, 0);
|
||||
if (status) {
|
||||
|
|
@ -747,7 +736,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
}
|
||||
|
||||
/* start read urb */
|
||||
dev_dbg(&port->dev, "%s - start read urb\n", __func__);
|
||||
urb = port->read_urb;
|
||||
if (!urb) {
|
||||
dev_err(&port->dev, "%s - no read urb\n", __func__);
|
||||
|
|
@ -773,7 +761,6 @@ unlink_int_urb:
|
|||
usb_kill_urb(port->serial->port[0]->interrupt_in_urb);
|
||||
release_lock:
|
||||
mutex_unlock(&tdev->td_open_close_lock);
|
||||
dev_dbg(&port->dev, "%s - exit %d\n", __func__, status);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
@ -789,8 +776,6 @@ static void ti_close(struct usb_serial_port *port)
|
|||
|
||||
tdev = usb_get_serial_data(port->serial);
|
||||
tport = usb_get_serial_port_data(port);
|
||||
if (tdev == NULL || tport == NULL)
|
||||
return;
|
||||
|
||||
tport->tp_is_open = 0;
|
||||
|
||||
|
|
@ -803,7 +788,6 @@ static void ti_close(struct usb_serial_port *port)
|
|||
|
||||
port_number = port->port_number;
|
||||
|
||||
dev_dbg(&port->dev, "%s - sending TI_CLOSE_PORT\n", __func__);
|
||||
status = ti_command_out_sync(tdev, TI_CLOSE_PORT,
|
||||
(__u8)(TI_UART1_PORT + port_number), 0, NULL, 0);
|
||||
if (status)
|
||||
|
|
@ -830,11 +814,10 @@ static int ti_write(struct tty_struct *tty, struct usb_serial_port *port,
|
|||
struct ti_port *tport = usb_get_serial_port_data(port);
|
||||
|
||||
if (count == 0) {
|
||||
dev_dbg(&port->dev, "%s - write request of 0 bytes\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (tport == NULL || !tport->tp_is_open)
|
||||
if (!tport->tp_is_open)
|
||||
return -ENODEV;
|
||||
|
||||
count = kfifo_in_locked(&port->write_fifo, data, count,
|
||||
|
|
@ -852,9 +835,6 @@ static int ti_write_room(struct tty_struct *tty)
|
|||
int room = 0;
|
||||
unsigned long flags;
|
||||
|
||||
if (tport == NULL)
|
||||
return 0;
|
||||
|
||||
spin_lock_irqsave(&tport->tp_lock, flags);
|
||||
room = kfifo_avail(&port->write_fifo);
|
||||
spin_unlock_irqrestore(&tport->tp_lock, flags);
|
||||
|
|
@ -871,9 +851,6 @@ static int ti_chars_in_buffer(struct tty_struct *tty)
|
|||
int chars = 0;
|
||||
unsigned long flags;
|
||||
|
||||
if (tport == NULL)
|
||||
return 0;
|
||||
|
||||
spin_lock_irqsave(&tport->tp_lock, flags);
|
||||
chars = kfifo_len(&port->write_fifo);
|
||||
spin_unlock_irqrestore(&tport->tp_lock, flags);
|
||||
|
|
@ -900,9 +877,6 @@ static void ti_throttle(struct tty_struct *tty)
|
|||
struct usb_serial_port *port = tty->driver_data;
|
||||
struct ti_port *tport = usb_get_serial_port_data(port);
|
||||
|
||||
if (tport == NULL)
|
||||
return;
|
||||
|
||||
if (I_IXOFF(tty) || C_CRTSCTS(tty))
|
||||
ti_stop_read(tport, tty);
|
||||
|
||||
|
|
@ -915,9 +889,6 @@ static void ti_unthrottle(struct tty_struct *tty)
|
|||
struct ti_port *tport = usb_get_serial_port_data(port);
|
||||
int status;
|
||||
|
||||
if (tport == NULL)
|
||||
return;
|
||||
|
||||
if (I_IXOFF(tty) || C_CRTSCTS(tty)) {
|
||||
status = ti_restart_read(tport, tty);
|
||||
if (status)
|
||||
|
|
@ -932,16 +903,11 @@ static int ti_ioctl(struct tty_struct *tty,
|
|||
struct usb_serial_port *port = tty->driver_data;
|
||||
struct ti_port *tport = usb_get_serial_port_data(port);
|
||||
|
||||
if (tport == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
switch (cmd) {
|
||||
case TIOCGSERIAL:
|
||||
dev_dbg(&port->dev, "%s - TIOCGSERIAL\n", __func__);
|
||||
return ti_get_serial_info(tport,
|
||||
(struct serial_struct __user *)arg);
|
||||
case TIOCSSERIAL:
|
||||
dev_dbg(&port->dev, "%s - TIOCSSERIAL\n", __func__);
|
||||
return ti_set_serial_info(tty, tport,
|
||||
(struct serial_struct __user *)arg);
|
||||
}
|
||||
|
|
@ -959,6 +925,8 @@ static void ti_set_termios(struct tty_struct *tty,
|
|||
int status;
|
||||
int port_number = port->port_number;
|
||||
unsigned int mcr;
|
||||
u16 wbaudrate;
|
||||
u16 wflags = 0;
|
||||
|
||||
cflag = tty->termios.c_cflag;
|
||||
iflag = tty->termios.c_iflag;
|
||||
|
|
@ -967,21 +935,16 @@ static void ti_set_termios(struct tty_struct *tty,
|
|||
dev_dbg(&port->dev, "%s - old clfag %08x, old iflag %08x\n", __func__,
|
||||
old_termios->c_cflag, old_termios->c_iflag);
|
||||
|
||||
if (tport == NULL)
|
||||
return;
|
||||
|
||||
config = kmalloc(sizeof(*config), GFP_KERNEL);
|
||||
if (!config)
|
||||
return;
|
||||
|
||||
config->wFlags = 0;
|
||||
|
||||
/* these flags must be set */
|
||||
config->wFlags |= TI_UART_ENABLE_MS_INTS;
|
||||
config->wFlags |= TI_UART_ENABLE_AUTO_START_DMA;
|
||||
config->bUartMode = (__u8)(tport->tp_uart_mode);
|
||||
wflags |= TI_UART_ENABLE_MS_INTS;
|
||||
wflags |= TI_UART_ENABLE_AUTO_START_DMA;
|
||||
config->bUartMode = tport->tp_uart_mode;
|
||||
|
||||
switch (cflag & CSIZE) {
|
||||
switch (C_CSIZE(tty)) {
|
||||
case CS5:
|
||||
config->bDataBits = TI_UART_5_DATA_BITS;
|
||||
break;
|
||||
|
|
@ -1000,29 +963,29 @@ static void ti_set_termios(struct tty_struct *tty,
|
|||
/* CMSPAR isn't supported by this driver */
|
||||
tty->termios.c_cflag &= ~CMSPAR;
|
||||
|
||||
if (cflag & PARENB) {
|
||||
if (cflag & PARODD) {
|
||||
config->wFlags |= TI_UART_ENABLE_PARITY_CHECKING;
|
||||
if (C_PARENB(tty)) {
|
||||
if (C_PARODD(tty)) {
|
||||
wflags |= TI_UART_ENABLE_PARITY_CHECKING;
|
||||
config->bParity = TI_UART_ODD_PARITY;
|
||||
} else {
|
||||
config->wFlags |= TI_UART_ENABLE_PARITY_CHECKING;
|
||||
wflags |= TI_UART_ENABLE_PARITY_CHECKING;
|
||||
config->bParity = TI_UART_EVEN_PARITY;
|
||||
}
|
||||
} else {
|
||||
config->wFlags &= ~TI_UART_ENABLE_PARITY_CHECKING;
|
||||
wflags &= ~TI_UART_ENABLE_PARITY_CHECKING;
|
||||
config->bParity = TI_UART_NO_PARITY;
|
||||
}
|
||||
|
||||
if (cflag & CSTOPB)
|
||||
if (C_CSTOPB(tty))
|
||||
config->bStopBits = TI_UART_2_STOP_BITS;
|
||||
else
|
||||
config->bStopBits = TI_UART_1_STOP_BITS;
|
||||
|
||||
if (cflag & CRTSCTS) {
|
||||
if (C_CRTSCTS(tty)) {
|
||||
/* RTS flow control must be off to drop RTS for baud rate B0 */
|
||||
if ((cflag & CBAUD) != B0)
|
||||
config->wFlags |= TI_UART_ENABLE_RTS_IN;
|
||||
config->wFlags |= TI_UART_ENABLE_CTS_OUT;
|
||||
if ((C_BAUD(tty)) != B0)
|
||||
wflags |= TI_UART_ENABLE_RTS_IN;
|
||||
wflags |= TI_UART_ENABLE_CTS_OUT;
|
||||
} else {
|
||||
ti_restart_read(tport, tty);
|
||||
}
|
||||
|
|
@ -1032,34 +995,34 @@ static void ti_set_termios(struct tty_struct *tty,
|
|||
config->cXoff = STOP_CHAR(tty);
|
||||
|
||||
if (I_IXOFF(tty))
|
||||
config->wFlags |= TI_UART_ENABLE_X_IN;
|
||||
wflags |= TI_UART_ENABLE_X_IN;
|
||||
else
|
||||
ti_restart_read(tport, tty);
|
||||
|
||||
if (I_IXON(tty))
|
||||
config->wFlags |= TI_UART_ENABLE_X_OUT;
|
||||
wflags |= TI_UART_ENABLE_X_OUT;
|
||||
}
|
||||
|
||||
baud = tty_get_baud_rate(tty);
|
||||
if (!baud)
|
||||
baud = 9600;
|
||||
if (tport->tp_tdev->td_is_3410)
|
||||
config->wBaudRate = (__u16)((923077 + baud/2) / baud);
|
||||
wbaudrate = (923077 + baud/2) / baud;
|
||||
else
|
||||
config->wBaudRate = (__u16)((461538 + baud/2) / baud);
|
||||
wbaudrate = (461538 + baud/2) / baud;
|
||||
|
||||
/* FIXME: Should calculate resulting baud here and report it back */
|
||||
if ((cflag & CBAUD) != B0)
|
||||
if ((C_BAUD(tty)) != B0)
|
||||
tty_encode_baud_rate(tty, baud, baud);
|
||||
|
||||
dev_dbg(&port->dev,
|
||||
"%s - BaudRate=%d, wBaudRate=%d, wFlags=0x%04X, bDataBits=%d, bParity=%d, bStopBits=%d, cXon=%d, cXoff=%d, bUartMode=%d\n",
|
||||
__func__, baud, config->wBaudRate, config->wFlags,
|
||||
__func__, baud, wbaudrate, wflags,
|
||||
config->bDataBits, config->bParity, config->bStopBits,
|
||||
config->cXon, config->cXoff, config->bUartMode);
|
||||
|
||||
cpu_to_be16s(&config->wBaudRate);
|
||||
cpu_to_be16s(&config->wFlags);
|
||||
config->wBaudRate = cpu_to_be16(wbaudrate);
|
||||
config->wFlags = cpu_to_be16(wflags);
|
||||
|
||||
status = ti_command_out_sync(tport->tp_tdev, TI_SET_CONFIG,
|
||||
(__u8)(TI_UART1_PORT + port_number), 0, (__u8 *)config,
|
||||
|
|
@ -1071,7 +1034,7 @@ static void ti_set_termios(struct tty_struct *tty,
|
|||
/* SET_CONFIG asserts RTS and DTR, reset them correctly */
|
||||
mcr = tport->tp_shadow_mcr;
|
||||
/* if baud rate is B0, clear RTS and DTR */
|
||||
if ((cflag & CBAUD) == B0)
|
||||
if (C_BAUD(tty) == B0)
|
||||
mcr &= ~(TI_MCR_DTR | TI_MCR_RTS);
|
||||
status = ti_set_mcr(tport, mcr);
|
||||
if (status)
|
||||
|
|
@ -1092,9 +1055,6 @@ static int ti_tiocmget(struct tty_struct *tty)
|
|||
unsigned int mcr;
|
||||
unsigned long flags;
|
||||
|
||||
if (tport == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
spin_lock_irqsave(&tport->tp_lock, flags);
|
||||
msr = tport->tp_msr;
|
||||
mcr = tport->tp_shadow_mcr;
|
||||
|
|
@ -1122,9 +1082,6 @@ static int ti_tiocmset(struct tty_struct *tty,
|
|||
unsigned int mcr;
|
||||
unsigned long flags;
|
||||
|
||||
if (tport == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
spin_lock_irqsave(&tport->tp_lock, flags);
|
||||
mcr = tport->tp_shadow_mcr;
|
||||
|
||||
|
|
@ -1155,9 +1112,6 @@ static void ti_break(struct tty_struct *tty, int break_state)
|
|||
|
||||
dev_dbg(&port->dev, "%s - state = %d\n", __func__, break_state);
|
||||
|
||||
if (tport == NULL)
|
||||
return;
|
||||
|
||||
status = ti_write_byte(port, tport->tp_tdev,
|
||||
tport->tp_uart_base_addr + TI_UART_OFFSET_LCR,
|
||||
TI_LCR_BREAK, break_state == -1 ? TI_LCR_BREAK : 0);
|
||||
|
|
@ -1189,7 +1143,7 @@ static void ti_interrupt_callback(struct urb *urb)
|
|||
int function;
|
||||
int status = urb->status;
|
||||
int retval;
|
||||
__u8 msr;
|
||||
u8 msr;
|
||||
|
||||
switch (status) {
|
||||
case 0:
|
||||
|
|
@ -1198,11 +1152,9 @@ static void ti_interrupt_callback(struct urb *urb)
|
|||
case -ENOENT:
|
||||
case -ESHUTDOWN:
|
||||
dev_dbg(dev, "%s - urb shutting down, %d\n", __func__, status);
|
||||
tdev->td_urb_error = 1;
|
||||
return;
|
||||
default:
|
||||
dev_err(dev, "%s - nonzero urb status, %d\n", __func__, status);
|
||||
tdev->td_urb_error = 1;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
|
@ -1275,12 +1227,10 @@ static void ti_bulk_in_callback(struct urb *urb)
|
|||
case -ENOENT:
|
||||
case -ESHUTDOWN:
|
||||
dev_dbg(dev, "%s - urb shutting down, %d\n", __func__, status);
|
||||
tport->tp_tdev->td_urb_error = 1;
|
||||
return;
|
||||
default:
|
||||
dev_err(dev, "%s - nonzero urb status, %d\n",
|
||||
__func__, status);
|
||||
tport->tp_tdev->td_urb_error = 1;
|
||||
}
|
||||
|
||||
if (status == -EPIPE)
|
||||
|
|
@ -1335,12 +1285,10 @@ static void ti_bulk_out_callback(struct urb *urb)
|
|||
case -ENOENT:
|
||||
case -ESHUTDOWN:
|
||||
dev_dbg(&port->dev, "%s - urb shutting down, %d\n", __func__, status);
|
||||
tport->tp_tdev->td_urb_error = 1;
|
||||
return;
|
||||
default:
|
||||
dev_err_console(port, "%s - nonzero urb status, %d\n",
|
||||
__func__, status);
|
||||
tport->tp_tdev->td_urb_error = 1;
|
||||
}
|
||||
|
||||
/* send any buffered data */
|
||||
|
|
@ -1490,7 +1438,6 @@ static int ti_get_serial_info(struct ti_port *tport,
|
|||
ret_serial.type = PORT_16550A;
|
||||
ret_serial.line = port->minor;
|
||||
ret_serial.port = port->port_number;
|
||||
ret_serial.flags = tport->tp_flags;
|
||||
ret_serial.xmit_fifo_size = kfifo_size(&port->write_fifo);
|
||||
ret_serial.baud_base = tport->tp_tdev->td_is_3410 ? 921600 : 460800;
|
||||
ret_serial.closing_wait = cwait;
|
||||
|
|
@ -1515,14 +1462,13 @@ static int ti_set_serial_info(struct tty_struct *tty, struct ti_port *tport,
|
|||
if (cwait != ASYNC_CLOSING_WAIT_NONE)
|
||||
cwait = msecs_to_jiffies(10 * new_serial.closing_wait);
|
||||
|
||||
tport->tp_flags = new_serial.flags & TI_SET_SERIAL_FLAGS;
|
||||
tport->tp_port->port.closing_wait = cwait;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void ti_handle_new_msr(struct ti_port *tport, __u8 msr)
|
||||
static void ti_handle_new_msr(struct ti_port *tport, u8 msr)
|
||||
{
|
||||
struct async_icount *icount;
|
||||
struct tty_struct *tty;
|
||||
|
|
@ -1634,8 +1580,8 @@ static int ti_command_in_sync(struct ti_device *tdev, __u8 command,
|
|||
|
||||
|
||||
static int ti_write_byte(struct usb_serial_port *port,
|
||||
struct ti_device *tdev, unsigned long addr,
|
||||
__u8 mask, __u8 byte)
|
||||
struct ti_device *tdev, unsigned long addr,
|
||||
u8 mask, u8 byte)
|
||||
{
|
||||
int status;
|
||||
unsigned int size;
|
||||
|
|
@ -1679,11 +1625,10 @@ static int ti_do_download(struct usb_device *dev, int pipe,
|
|||
int len;
|
||||
|
||||
for (pos = sizeof(struct ti_firmware_header); pos < size; pos++)
|
||||
cs = (__u8)(cs + buffer[pos]);
|
||||
cs = (u8)(cs + buffer[pos]);
|
||||
|
||||
header = (struct ti_firmware_header *)buffer;
|
||||
header->wLength = cpu_to_le16((__u16)(size
|
||||
- sizeof(struct ti_firmware_header)));
|
||||
header->wLength = cpu_to_le16(size - sizeof(*header));
|
||||
header->bCheckSum = cs;
|
||||
|
||||
dev_dbg(&dev->dev, "%s - downloading firmware\n", __func__);
|
||||
|
|
@ -1701,7 +1646,7 @@ static int ti_download_firmware(struct ti_device *tdev)
|
|||
{
|
||||
int status;
|
||||
int buffer_size;
|
||||
__u8 *buffer;
|
||||
u8 *buffer;
|
||||
struct usb_device *dev = tdev->td_serial->dev;
|
||||
unsigned int pipe = usb_sndbulkpipe(dev,
|
||||
tdev->td_serial->port[0]->bulk_out_endpointAddress);
|
||||
|
|
|
|||
Loading…
Reference in a new issue