USB: pl2303: remove 80-columns limit violations in pl2303 driver
Fixes several lines that overrun 80 columns in Prolific pl2303 driver and cleans up some space usages in the function calls. Signed-off-by: Thiago Galesi <thiagogalesi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Thiago Galesi
Greg Kroah-Hartman
Родитель
a009b75aa0
Коммит
372db8a780
|
|
@ -84,7 +84,7 @@ static struct usb_device_id id_table [] = {
|
|||
{ } /* Terminating entry */
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE (usb, id_table);
|
||||
MODULE_DEVICE_TABLE(usb, id_table);
|
||||
|
||||
static struct usb_driver pl2303_driver = {
|
||||
.name = "pl2303",
|
||||
|
|
@ -205,7 +205,7 @@ struct pl2303_private {
|
|||
};
|
||||
|
||||
|
||||
static int pl2303_startup (struct usb_serial *serial)
|
||||
static int pl2303_startup(struct usb_serial *serial)
|
||||
{
|
||||
struct pl2303_private *priv;
|
||||
enum pl2303_type type = type_0;
|
||||
|
|
@ -247,18 +247,19 @@ cleanup:
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
static int set_control_lines (struct usb_device *dev, u8 value)
|
||||
static int set_control_lines(struct usb_device *dev, u8 value)
|
||||
{
|
||||
int retval;
|
||||
|
||||
retval = usb_control_msg (dev, usb_sndctrlpipe (dev, 0),
|
||||
SET_CONTROL_REQUEST, SET_CONTROL_REQUEST_TYPE,
|
||||
value, 0, NULL, 0, 100);
|
||||
retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
|
||||
SET_CONTROL_REQUEST, SET_CONTROL_REQUEST_TYPE,
|
||||
value, 0, NULL, 0, 100);
|
||||
dbg("%s - value = %d, retval = %d", __FUNCTION__, value, retval);
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int pl2303_write (struct usb_serial_port *port, const unsigned char *buf, int count)
|
||||
static int pl2303_write(struct usb_serial_port *port, const unsigned char *buf,
|
||||
int count)
|
||||
{
|
||||
struct pl2303_private *priv = usb_get_serial_port_data(port);
|
||||
unsigned long flags;
|
||||
|
|
@ -293,7 +294,7 @@ static void pl2303_send(struct usb_serial_port *port)
|
|||
}
|
||||
|
||||
count = pl2303_buf_get(priv->buf, port->write_urb->transfer_buffer,
|
||||
port->bulk_out_size);
|
||||
port->bulk_out_size);
|
||||
|
||||
if (count == 0) {
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
|
@ -304,13 +305,15 @@ static void pl2303_send(struct usb_serial_port *port)
|
|||
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count, port->write_urb->transfer_buffer);
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count,
|
||||
port->write_urb->transfer_buffer);
|
||||
|
||||
port->write_urb->transfer_buffer_length = count;
|
||||
port->write_urb->dev = port->serial->dev;
|
||||
result = usb_submit_urb (port->write_urb, GFP_ATOMIC);
|
||||
result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
|
||||
if (result) {
|
||||
dev_err(&port->dev, "%s - failed submitting write urb, error %d\n", __FUNCTION__, result);
|
||||
dev_err(&port->dev, "%s - failed submitting write urb,"
|
||||
" error %d\n", __FUNCTION__, result);
|
||||
priv->write_urb_in_use = 0;
|
||||
// TODO: reschedule pl2303_send
|
||||
}
|
||||
|
|
@ -350,7 +353,8 @@ static int pl2303_chars_in_buffer(struct usb_serial_port *port)
|
|||
return chars;
|
||||
}
|
||||
|
||||
static void pl2303_set_termios (struct usb_serial_port *port, struct termios *old_termios)
|
||||
static void pl2303_set_termios(struct usb_serial_port *port,
|
||||
struct termios *old_termios)
|
||||
{
|
||||
struct usb_serial *serial = port->serial;
|
||||
struct pl2303_private *priv = usb_get_serial_port_data(port);
|
||||
|
|
@ -371,7 +375,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
|
|||
spin_lock_irqsave(&priv->lock, flags);
|
||||
if (!priv->termios_initialized) {
|
||||
*(port->tty->termios) = tty_std_termios;
|
||||
port->tty->termios->c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
|
||||
port->tty->termios->c_cflag = B9600 | CS8 | CREAD |
|
||||
HUPCL | CLOCAL;
|
||||
priv->termios_initialized = 1;
|
||||
}
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
|
@ -380,24 +385,24 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
|
|||
/* check that they really want us to change something */
|
||||
if (old_termios) {
|
||||
if ((cflag == old_termios->c_cflag) &&
|
||||
(RELEVANT_IFLAG(port->tty->termios->c_iflag) == RELEVANT_IFLAG(old_termios->c_iflag))) {
|
||||
dbg("%s - nothing to change...", __FUNCTION__);
|
||||
return;
|
||||
(RELEVANT_IFLAG(port->tty->termios->c_iflag) ==
|
||||
RELEVANT_IFLAG(old_termios->c_iflag))) {
|
||||
dbg("%s - nothing to change...", __FUNCTION__);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
buf = kzalloc (7, GFP_KERNEL);
|
||||
buf = kzalloc(7, GFP_KERNEL);
|
||||
if (!buf) {
|
||||
dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__);
|
||||
return;
|
||||
}
|
||||
|
||||
i = usb_control_msg (serial->dev, usb_rcvctrlpipe (serial->dev, 0),
|
||||
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
|
||||
0, 0, buf, 7, 100);
|
||||
dbg ("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
|
||||
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
|
||||
|
||||
i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
|
||||
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
|
||||
0, 0, buf, 7, 100);
|
||||
dbg("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
|
||||
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
|
||||
|
||||
if (cflag & CSIZE) {
|
||||
switch (cflag & CSIZE) {
|
||||
|
|
@ -429,7 +434,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
|
|||
case B230400: baud = 230400; break;
|
||||
case B460800: baud = 460800; break;
|
||||
default:
|
||||
dev_err(&port->dev, "pl2303 driver does not support the baudrate requested (fix it)\n");
|
||||
dev_err(&port->dev, "pl2303 driver does not support"
|
||||
" the baudrate requested (fix it)\n");
|
||||
break;
|
||||
}
|
||||
dbg("%s - baud = %d", __FUNCTION__, baud);
|
||||
|
|
@ -469,10 +475,10 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
|
|||
dbg("%s - parity = none", __FUNCTION__);
|
||||
}
|
||||
|
||||
i = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0),
|
||||
SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
|
||||
0, 0, buf, 7, 100);
|
||||
dbg ("0x21:0x20:0:0 %d", i);
|
||||
i = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
|
||||
SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
|
||||
0, 0, buf, 7, 100);
|
||||
dbg("0x21:0x20:0:0 %d", i);
|
||||
|
||||
/* change control lines if we are switching to or from B0 */
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
|
|
@ -488,13 +494,13 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
|
|||
} else {
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
}
|
||||
|
||||
|
||||
buf[0] = buf[1] = buf[2] = buf[3] = buf[4] = buf[5] = buf[6] = 0;
|
||||
|
||||
i = usb_control_msg (serial->dev, usb_rcvctrlpipe (serial->dev, 0),
|
||||
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
|
||||
0, 0, buf, 7, 100);
|
||||
dbg ("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
|
||||
i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
|
||||
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
|
||||
0, 0, buf, 7, 100);
|
||||
dbg("0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x", i,
|
||||
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
|
||||
|
||||
if (cflag & CRTSCTS) {
|
||||
|
|
@ -503,18 +509,18 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol
|
|||
index = 0x61;
|
||||
else
|
||||
index = 0x41;
|
||||
i = usb_control_msg(serial->dev,
|
||||
i = usb_control_msg(serial->dev,
|
||||
usb_sndctrlpipe(serial->dev, 0),
|
||||
VENDOR_WRITE_REQUEST,
|
||||
VENDOR_WRITE_REQUEST_TYPE,
|
||||
0x0, index, NULL, 0, 100);
|
||||
dbg ("0x40:0x1:0x0:0x%x %d", index, i);
|
||||
dbg("0x40:0x1:0x0:0x%x %d", index, i);
|
||||
}
|
||||
|
||||
kfree (buf);
|
||||
kfree(buf);
|
||||
}
|
||||
|
||||
static int pl2303_open (struct usb_serial_port *port, struct file *filp)
|
||||
static int pl2303_open(struct usb_serial_port *port, struct file *filp)
|
||||
{
|
||||
struct termios tmp_termios;
|
||||
struct usb_serial *serial = port->serial;
|
||||
|
|
@ -568,33 +574,34 @@ static int pl2303_open (struct usb_serial_port *port, struct file *filp)
|
|||
|
||||
/* Setup termios */
|
||||
if (port->tty) {
|
||||
pl2303_set_termios (port, &tmp_termios);
|
||||
pl2303_set_termios(port, &tmp_termios);
|
||||
}
|
||||
|
||||
//FIXME: need to assert RTS and DTR if CRTSCTS off
|
||||
|
||||
dbg("%s - submitting read urb", __FUNCTION__);
|
||||
port->read_urb->dev = serial->dev;
|
||||
result = usb_submit_urb (port->read_urb, GFP_KERNEL);
|
||||
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
|
||||
if (result) {
|
||||
dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", __FUNCTION__, result);
|
||||
pl2303_close (port, NULL);
|
||||
dev_err(&port->dev, "%s - failed submitting read urb,"
|
||||
" error %d\n", __FUNCTION__, result);
|
||||
pl2303_close(port, NULL);
|
||||
return -EPROTO;
|
||||
}
|
||||
|
||||
dbg("%s - submitting interrupt urb", __FUNCTION__);
|
||||
port->interrupt_in_urb->dev = serial->dev;
|
||||
result = usb_submit_urb (port->interrupt_in_urb, GFP_KERNEL);
|
||||
result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
|
||||
if (result) {
|
||||
dev_err(&port->dev, "%s - failed submitting interrupt urb, error %d\n", __FUNCTION__, result);
|
||||
pl2303_close (port, NULL);
|
||||
dev_err(&port->dev, "%s - failed submitting interrupt urb,"
|
||||
" error %d\n", __FUNCTION__, result);
|
||||
pl2303_close(port, NULL);
|
||||
return -EPROTO;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void pl2303_close (struct usb_serial_port *port, struct file *filp)
|
||||
static void pl2303_close(struct usb_serial_port *port, struct file *filp)
|
||||
{
|
||||
struct pl2303_private *priv = usb_get_serial_port_data(port);
|
||||
unsigned long flags;
|
||||
|
|
@ -612,9 +619,9 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp)
|
|||
add_wait_queue(&port->tty->write_wait, &wait);
|
||||
for (;;) {
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
if (pl2303_buf_data_avail(priv->buf) == 0
|
||||
|| timeout == 0 || signal_pending(current)
|
||||
|| !usb_get_intfdata(port->serial->interface)) /* disconnect */
|
||||
if (pl2303_buf_data_avail(priv->buf) == 0 ||
|
||||
timeout == 0 || signal_pending(current) ||
|
||||
!usb_get_intfdata(port->serial->interface)) /* disconnect */
|
||||
break;
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
timeout = schedule_timeout(timeout);
|
||||
|
|
@ -652,14 +659,14 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp)
|
|||
/* drop DTR and RTS */
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
priv->line_control = 0;
|
||||
spin_unlock_irqrestore (&priv->lock, flags);
|
||||
set_control_lines (port->serial->dev, 0);
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
set_control_lines(port->serial->dev, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file,
|
||||
unsigned int set, unsigned int clear)
|
||||
static int pl2303_tiocmset(struct usb_serial_port *port, struct file *file,
|
||||
unsigned int set, unsigned int clear)
|
||||
{
|
||||
struct pl2303_private *priv = usb_get_serial_port_data(port);
|
||||
unsigned long flags;
|
||||
|
|
@ -668,7 +675,7 @@ static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file,
|
|||
if (!usb_get_intfdata(port->serial->interface))
|
||||
return -ENODEV;
|
||||
|
||||
spin_lock_irqsave (&priv->lock, flags);
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
if (set & TIOCM_RTS)
|
||||
priv->line_control |= CONTROL_RTS;
|
||||
if (set & TIOCM_DTR)
|
||||
|
|
@ -678,12 +685,12 @@ static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file,
|
|||
if (clear & TIOCM_DTR)
|
||||
priv->line_control &= ~CONTROL_DTR;
|
||||
control = priv->line_control;
|
||||
spin_unlock_irqrestore (&priv->lock, flags);
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
return set_control_lines (port->serial->dev, control);
|
||||
return set_control_lines(port->serial->dev, control);
|
||||
}
|
||||
|
||||
static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file)
|
||||
static int pl2303_tiocmget(struct usb_serial_port *port, struct file *file)
|
||||
{
|
||||
struct pl2303_private *priv = usb_get_serial_port_data(port);
|
||||
unsigned long flags;
|
||||
|
|
@ -696,10 +703,10 @@ static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file)
|
|||
if (!usb_get_intfdata(port->serial->interface))
|
||||
return -ENODEV;
|
||||
|
||||
spin_lock_irqsave (&priv->lock, flags);
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
mcr = priv->line_control;
|
||||
status = priv->line_status;
|
||||
spin_unlock_irqrestore (&priv->lock, flags);
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0)
|
||||
| ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0)
|
||||
|
|
@ -721,22 +728,22 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
|
|||
unsigned int status;
|
||||
unsigned int changed;
|
||||
|
||||
spin_lock_irqsave (&priv->lock, flags);
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
prevstatus = priv->line_status;
|
||||
spin_unlock_irqrestore (&priv->lock, flags);
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
while (1) {
|
||||
interruptible_sleep_on(&priv->delta_msr_wait);
|
||||
/* see if a signal did it */
|
||||
if (signal_pending(current))
|
||||
return -ERESTARTSYS;
|
||||
|
||||
spin_lock_irqsave (&priv->lock, flags);
|
||||
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
status = priv->line_status;
|
||||
spin_unlock_irqrestore (&priv->lock, flags);
|
||||
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
changed=prevstatus^status;
|
||||
|
||||
|
||||
if (((arg & TIOCM_RNG) && (changed & UART_RING)) ||
|
||||
((arg & TIOCM_DSR) && (changed & UART_DSR)) ||
|
||||
((arg & TIOCM_CD) && (changed & UART_DCD)) ||
|
||||
|
|
@ -749,7 +756,8 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)
|
||||
static int pl2303_ioctl(struct usb_serial_port *port, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
|
||||
|
||||
|
|
@ -766,7 +774,7 @@ static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsign
|
|||
return -ENOIOCTLCMD;
|
||||
}
|
||||
|
||||
static void pl2303_break_ctl (struct usb_serial_port *port, int break_state)
|
||||
static void pl2303_break_ctl(struct usb_serial_port *port, int break_state)
|
||||
{
|
||||
struct usb_serial *serial = port->serial;
|
||||
u16 state;
|
||||
|
|
@ -780,15 +788,14 @@ static void pl2303_break_ctl (struct usb_serial_port *port, int break_state)
|
|||
state = BREAK_ON;
|
||||
dbg("%s - turning break %s", __FUNCTION__, state==BREAK_OFF ? "off" : "on");
|
||||
|
||||
result = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0),
|
||||
BREAK_REQUEST, BREAK_REQUEST_TYPE, state,
|
||||
0, NULL, 0, 100);
|
||||
result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
|
||||
BREAK_REQUEST, BREAK_REQUEST_TYPE, state,
|
||||
0, NULL, 0, 100);
|
||||
if (result)
|
||||
dbg("%s - error sending break = %d", __FUNCTION__, result);
|
||||
}
|
||||
|
||||
|
||||
static void pl2303_shutdown (struct usb_serial *serial)
|
||||
static void pl2303_shutdown(struct usb_serial *serial)
|
||||
{
|
||||
int i;
|
||||
struct pl2303_private *priv;
|
||||
|
|
@ -802,7 +809,7 @@ static void pl2303_shutdown (struct usb_serial *serial)
|
|||
kfree(priv);
|
||||
usb_set_serial_port_data(serial->port[i], NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void pl2303_update_line_status(struct usb_serial_port *port,
|
||||
|
|
@ -830,10 +837,10 @@ static void pl2303_update_line_status(struct usb_serial_port *port,
|
|||
spin_lock_irqsave(&priv->lock, flags);
|
||||
priv->line_status = data[status_idx];
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
wake_up_interruptible (&priv->delta_msr_wait);
|
||||
wake_up_interruptible(&priv->delta_msr_wait);
|
||||
}
|
||||
|
||||
static void pl2303_read_int_callback (struct urb *urb, struct pt_regs *regs)
|
||||
static void pl2303_read_int_callback(struct urb *urb, struct pt_regs *regs)
|
||||
{
|
||||
struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
|
||||
unsigned char *data = urb->transfer_buffer;
|
||||
|
|
@ -850,25 +857,29 @@ static void pl2303_read_int_callback (struct urb *urb, struct pt_regs *regs)
|
|||
case -ENOENT:
|
||||
case -ESHUTDOWN:
|
||||
/* this urb is terminated, clean up */
|
||||
dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
|
||||
dbg("%s - urb shutting down with status: %d", __FUNCTION__,
|
||||
urb->status);
|
||||
return;
|
||||
default:
|
||||
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
|
||||
dbg("%s - nonzero urb status received: %d", __FUNCTION__,
|
||||
urb->status);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, urb->transfer_buffer);
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__,
|
||||
urb->actual_length, urb->transfer_buffer);
|
||||
|
||||
pl2303_update_line_status(port, data, actual_length);
|
||||
|
||||
exit:
|
||||
status = usb_submit_urb (urb, GFP_ATOMIC);
|
||||
status = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (status)
|
||||
dev_err(&urb->dev->dev, "%s - usb_submit_urb failed with result %d\n",
|
||||
dev_err(&urb->dev->dev,
|
||||
"%s - usb_submit_urb failed with result %d\n",
|
||||
__FUNCTION__, status);
|
||||
}
|
||||
|
||||
|
||||
static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
||||
static void pl2303_read_bulk_callback(struct urb *urb, struct pt_regs *regs)
|
||||
{
|
||||
struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
|
||||
struct pl2303_private *priv = usb_get_serial_port_data(port);
|
||||
|
|
@ -889,20 +900,25 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
|||
return;
|
||||
}
|
||||
if (urb->status == -EPROTO) {
|
||||
/* PL2303 mysteriously fails with -EPROTO reschedule the read */
|
||||
dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__);
|
||||
/* PL2303 mysteriously fails with -EPROTO reschedule
|
||||
* the read */
|
||||
dbg("%s - caught -EPROTO, resubmitting the urb",
|
||||
__FUNCTION__);
|
||||
urb->status = 0;
|
||||
urb->dev = port->serial->dev;
|
||||
result = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (result)
|
||||
dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
|
||||
dev_err(&urb->dev->dev, "%s - failed"
|
||||
" resubmitting read urb, error %d\n",
|
||||
__FUNCTION__, result);
|
||||
return;
|
||||
}
|
||||
dbg("%s - unable to handle the error, exiting.", __FUNCTION__);
|
||||
return;
|
||||
}
|
||||
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
|
||||
usb_serial_debug_data(debug, &port->dev, __FUNCTION__,
|
||||
urb->actual_length, data);
|
||||
|
||||
/* get tty_flag from status */
|
||||
tty_flag = TTY_NORMAL;
|
||||
|
|
@ -911,7 +927,7 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
|||
status = priv->line_status;
|
||||
priv->line_status &= ~UART_STATE_TRANSIENT_MASK;
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
wake_up_interruptible (&priv->delta_msr_wait);
|
||||
wake_up_interruptible(&priv->delta_msr_wait);
|
||||
|
||||
/* break takes precedence over parity, */
|
||||
/* which takes precedence over framing errors */
|
||||
|
|
@ -930,8 +946,8 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
|||
if (status & UART_OVERRUN_ERROR)
|
||||
tty_insert_flip_char(tty, 0, TTY_OVERRUN);
|
||||
for (i = 0; i < urb->actual_length; ++i)
|
||||
tty_insert_flip_char (tty, data[i], tty_flag);
|
||||
tty_flip_buffer_push (tty);
|
||||
tty_insert_flip_char(tty, data[i], tty_flag);
|
||||
tty_flip_buffer_push(tty);
|
||||
}
|
||||
|
||||
/* Schedule the next read _if_ we are still open */
|
||||
|
|
@ -939,15 +955,14 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
|||
urb->dev = port->serial->dev;
|
||||
result = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (result)
|
||||
dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
|
||||
dev_err(&urb->dev->dev, "%s - failed resubmitting"
|
||||
" read urb, error %d\n", __FUNCTION__, result);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
||||
static void pl2303_write_bulk_callback(struct urb *urb, struct pt_regs *regs)
|
||||
{
|
||||
struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
|
||||
struct pl2303_private *priv = usb_get_serial_port_data(port);
|
||||
|
|
@ -963,18 +978,21 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
|||
case -ENOENT:
|
||||
case -ESHUTDOWN:
|
||||
/* this urb is terminated, clean up */
|
||||
dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
|
||||
dbg("%s - urb shutting down with status: %d", __FUNCTION__,
|
||||
urb->status);
|
||||
priv->write_urb_in_use = 0;
|
||||
return;
|
||||
default:
|
||||
/* error in the urb, so we have to resubmit it */
|
||||
dbg("%s - Overflow in write", __FUNCTION__);
|
||||
dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status);
|
||||
dbg("%s - nonzero write bulk status received: %d", __FUNCTION__,
|
||||
urb->status);
|
||||
port->write_urb->transfer_buffer_length = 1;
|
||||
port->write_urb->dev = port->serial->dev;
|
||||
result = usb_submit_urb (port->write_urb, GFP_ATOMIC);
|
||||
result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
|
||||
if (result)
|
||||
dev_err(&urb->dev->dev, "%s - failed resubmitting write urb, error %d\n", __FUNCTION__, result);
|
||||
dev_err(&urb->dev->dev, "%s - failed resubmitting write"
|
||||
" urb, error %d\n", __FUNCTION__, result);
|
||||
else
|
||||
return;
|
||||
}
|
||||
|
|
@ -985,19 +1003,15 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
|
|||
pl2303_send(port);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pl2303_buf_alloc
|
||||
*
|
||||
* Allocate a circular buffer and all associated memory.
|
||||
*/
|
||||
|
||||
static struct pl2303_buf *pl2303_buf_alloc(unsigned int size)
|
||||
{
|
||||
|
||||
struct pl2303_buf *pb;
|
||||
|
||||
|
||||
if (size == 0)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -1015,16 +1029,13 @@ static struct pl2303_buf *pl2303_buf_alloc(unsigned int size)
|
|||
pb->buf_get = pb->buf_put = pb->buf_buf;
|
||||
|
||||
return pb;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pl2303_buf_free
|
||||
*
|
||||
* Free the buffer and all associated memory.
|
||||
*/
|
||||
|
||||
static void pl2303_buf_free(struct pl2303_buf *pb)
|
||||
{
|
||||
if (pb) {
|
||||
|
|
@ -1033,13 +1044,11 @@ static void pl2303_buf_free(struct pl2303_buf *pb)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pl2303_buf_clear
|
||||
*
|
||||
* Clear out all data in the circular buffer.
|
||||
*/
|
||||
|
||||
static void pl2303_buf_clear(struct pl2303_buf *pb)
|
||||
{
|
||||
if (pb != NULL)
|
||||
|
|
@ -1047,14 +1056,12 @@ static void pl2303_buf_clear(struct pl2303_buf *pb)
|
|||
/* equivalent to a get of all data available */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pl2303_buf_data_avail
|
||||
*
|
||||
* Return the number of bytes of data available in the circular
|
||||
* buffer.
|
||||
*/
|
||||
|
||||
static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb)
|
||||
{
|
||||
if (pb != NULL)
|
||||
|
|
@ -1063,14 +1070,12 @@ static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pl2303_buf_space_avail
|
||||
*
|
||||
* Return the number of bytes of space available in the circular
|
||||
* buffer.
|
||||
*/
|
||||
|
||||
static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb)
|
||||
{
|
||||
if (pb != NULL)
|
||||
|
|
@ -1079,7 +1084,6 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pl2303_buf_put
|
||||
*
|
||||
|
|
@ -1088,14 +1092,11 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb)
|
|||
*
|
||||
* Return the number of bytes copied.
|
||||
*/
|
||||
|
||||
static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf,
|
||||
unsigned int count)
|
||||
unsigned int count)
|
||||
{
|
||||
|
||||
unsigned int len;
|
||||
|
||||
|
||||
if (pb == NULL)
|
||||
return 0;
|
||||
|
||||
|
|
@ -1120,10 +1121,8 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf,
|
|||
}
|
||||
|
||||
return count;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* pl2303_buf_get
|
||||
*
|
||||
|
|
@ -1132,14 +1131,11 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf,
|
|||
*
|
||||
* Return the number of bytes copied.
|
||||
*/
|
||||
|
||||
static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf,
|
||||
unsigned int count)
|
||||
unsigned int count)
|
||||
{
|
||||
|
||||
unsigned int len;
|
||||
|
||||
|
||||
if (pb == NULL)
|
||||
return 0;
|
||||
|
||||
|
|
@ -1164,12 +1160,12 @@ static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf,
|
|||
}
|
||||
|
||||
return count;
|
||||
|
||||
}
|
||||
|
||||
static int __init pl2303_init (void)
|
||||
static int __init pl2303_init(void)
|
||||
{
|
||||
int retval;
|
||||
|
||||
retval = usb_serial_register(&pl2303_device);
|
||||
if (retval)
|
||||
goto failed_usb_serial_register;
|
||||
|
|
@ -1184,14 +1180,12 @@ failed_usb_serial_register:
|
|||
return retval;
|
||||
}
|
||||
|
||||
|
||||
static void __exit pl2303_exit (void)
|
||||
static void __exit pl2303_exit(void)
|
||||
{
|
||||
usb_deregister (&pl2303_driver);
|
||||
usb_serial_deregister (&pl2303_device);
|
||||
usb_deregister(&pl2303_driver);
|
||||
usb_serial_deregister(&pl2303_device);
|
||||
}
|
||||
|
||||
|
||||
module_init(pl2303_init);
|
||||
module_exit(pl2303_exit);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче