# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.627 -> 1.628 # drivers/usb/serial/kl5kusb105.c 1.2 -> 1.3 # drivers/usb/serial/kl5kusb105.h 1.1 -> 1.2 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/08/29 greg@kroah.com 1.628 # USB: kl5kusb105 update due to usbserial core changes. # -------------------------------------------- # diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c --- a/drivers/usb/serial/kl5kusb105.c Thu Aug 29 13:54:32 2002 +++ b/drivers/usb/serial/kl5kusb105.c Thu Aug 29 13:54:32 2002 @@ -47,18 +47,14 @@ #include #include -#include -#include #include -#include #include #include -/*#include */ #include #include #include #include -/*#include */ +#include #include #ifdef CONFIG_USB_SERIAL_DEBUG @@ -111,81 +107,41 @@ */ /* - * All of the device info needed for the MCT USB-RS232 converter. + * All of the device info needed for the KLSI converters. */ -static __devinitdata struct usb_device_id id_table_combined [] = { +static struct usb_device_id id_table [] = { { USB_DEVICE(PALMCONNECT_VID, PALMCONNECT_PID) }, { USB_DEVICE(KLSI_VID, KLSI_KL5KUSB105D_PID) }, { } /* Terminating entry */ }; -static struct usb_device_id palmconnect_table [] = { - { USB_DEVICE(PALMCONNECT_VID, PALMCONNECT_PID) }, - { } /* Terminating entry */ -}; - -static struct usb_device_id kl5kusb105d_table [] = { - { USB_DEVICE(KLSI_VID, KLSI_KL5KUSB105D_PID) }, - { } /* Terminating entry */ -}; - +MODULE_DEVICE_TABLE (usb, id_table); -MODULE_DEVICE_TABLE (usb, id_table_combined); - - -static struct usb_serial_device_type palmconnect_device = { - name: "PalmConnect USB Serial", - id_table: palmconnect_table, - needs_interrupt_in: MUST_HAVE, /* 1 interrupt-in endpoints */ - needs_bulk_in: MUST_HAVE, /* 1 bulk-in endpoint */ - needs_bulk_out: MUST_HAVE, /* 1 bulk-out endpoint */ - num_interrupt_in: 1, - num_bulk_in: 1, - num_bulk_out: 1, - num_ports: 1, - open: klsi_105_open, - close: klsi_105_close, - write: klsi_105_write, - write_bulk_callback: klsi_105_write_bulk_callback, - chars_in_buffer: klsi_105_chars_in_buffer, - write_room: klsi_105_write_room, - read_bulk_callback: klsi_105_read_bulk_callback, - ioctl: klsi_105_ioctl, - set_termios: klsi_105_set_termios, - /*break_ctl: klsi_105_break_ctl,*/ - startup: klsi_105_startup, - shutdown: klsi_105_shutdown, - throttle: klsi_105_throttle, - unthrottle: klsi_105_unthrottle, -}; static struct usb_serial_device_type kl5kusb105d_device = { - name: "generic KL5KUSB105D USB->Serial", - id_table: kl5kusb105d_table, - needs_interrupt_in: MUST_HAVE, /* 1 interrupt-in endpoints */ - needs_bulk_in: MUST_HAVE, /* 1 bulk-in endpoint */ - needs_bulk_out: MUST_HAVE, /* 1 bulk-out endpoint */ - num_interrupt_in: 1, - num_bulk_in: 1, - num_bulk_out: 1, - num_ports: 1, - open: klsi_105_open, - close: klsi_105_close, - write: klsi_105_write, - write_bulk_callback: klsi_105_write_bulk_callback, - chars_in_buffer: klsi_105_chars_in_buffer, - write_room: klsi_105_write_room, - read_bulk_callback: klsi_105_read_bulk_callback, - ioctl: klsi_105_ioctl, - set_termios: klsi_105_set_termios, - /*break_ctl: klsi_105_break_ctl,*/ - startup: klsi_105_startup, - shutdown: klsi_105_shutdown, - throttle: klsi_105_throttle, - unthrottle: klsi_105_unthrottle, + .owner = THIS_MODULE, + .name = "KL5KUSB105D / PalmConnect", + .id_table = id_table, + .num_interrupt_in = 1, + .num_bulk_in = 1, + .num_bulk_out = 1, + .num_ports = 1, + .open = klsi_105_open, + .close = klsi_105_close, + .write = klsi_105_write, + .write_bulk_callback = klsi_105_write_bulk_callback, + .chars_in_buffer = klsi_105_chars_in_buffer, + .write_room = klsi_105_write_room, + .read_bulk_callback =klsi_105_read_bulk_callback, + .ioctl = klsi_105_ioctl, + .set_termios = klsi_105_set_termios, + /*.break_ctl = klsi_105_break_ctl,*/ + .startup = klsi_105_startup, + .shutdown = klsi_105_shutdown, + .throttle = klsi_105_throttle, + .unthrottle = klsi_105_unthrottle, }; - struct klsi_105_port_settings { __u8 pktlen; /* always 5, it seems */ __u8 baudrate; @@ -359,9 +315,6 @@ struct klsi_105_private *priv = (struct klsi_105_private*) serial->port[i].private; unsigned long flags; - while (serial->port[i].open_count > 0) { - klsi_105_close (&serial->port[i], NULL); - } if (priv) { /* kill our write urb pool */ @@ -397,90 +350,79 @@ struct usb_serial *serial = port->serial; struct klsi_105_private *priv = (struct klsi_105_private *)port->private; int retval = 0; + int rc; + int i; + unsigned long line_state; dbg("%s port %d", __FUNCTION__, port->number); - down (&port->sem); + /* force low_latency on so that our tty_push actually forces + * the data through + * port->tty->low_latency = 1; */ + + /* Do a defined restart: + * Set up sane default baud rate and send the 'READ_ON' + * vendor command. + * FIXME: set modem line control (how?) + * Then read the modem line control and store values in + * priv->line_state. + */ + priv->cfg.pktlen = 5; + priv->cfg.baudrate = kl5kusb105a_sio_b9600; + priv->cfg.databits = kl5kusb105a_dtb_8; + priv->cfg.unknown1 = 0; + priv->cfg.unknown2 = 1; + klsi_105_chg_port_settings(serial, &(priv->cfg)); - ++port->open_count; - MOD_INC_USE_COUNT; - - if (!port->active) { - int rc; - int i; - unsigned long line_state; - port->active = 1; - - /* force low_latency on so that our tty_push actually forces - * the data through - * port->tty->low_latency = 1; */ - - /* Do a defined restart: - * Set up sane default baud rate and send the 'READ_ON' - * vendor command. - * FIXME: set modem line control (how?) - * Then read the modem line control and store values in - * priv->line_state. - */ - priv->cfg.pktlen = 5; - priv->cfg.baudrate = kl5kusb105a_sio_b9600; - priv->cfg.databits = kl5kusb105a_dtb_8; - priv->cfg.unknown1 = 0; - priv->cfg.unknown2 = 1; - klsi_105_chg_port_settings(serial, &(priv->cfg)); - - /* set up termios structure */ - priv->termios.c_iflag = port->tty->termios->c_iflag; - priv->termios.c_oflag = port->tty->termios->c_oflag; - priv->termios.c_cflag = port->tty->termios->c_cflag; - priv->termios.c_lflag = port->tty->termios->c_lflag; - for (i=0; itermios.c_cc[i] = port->tty->termios->c_cc[i]; - - - /* READ_ON and urb submission */ - FILL_BULK_URB(port->read_urb, serial->dev, - usb_rcvbulkpipe(serial->dev, - port->bulk_in_endpointAddress), - port->read_urb->transfer_buffer, - port->read_urb->transfer_buffer_length, - klsi_105_read_bulk_callback, - port); - port->read_urb->transfer_flags |= USB_QUEUE_BULK; + /* set up termios structure */ + priv->termios.c_iflag = port->tty->termios->c_iflag; + priv->termios.c_oflag = port->tty->termios->c_oflag; + priv->termios.c_cflag = port->tty->termios->c_cflag; + priv->termios.c_lflag = port->tty->termios->c_lflag; + for (i=0; itermios.c_cc[i] = port->tty->termios->c_cc[i]; - rc = usb_submit_urb(port->read_urb); - if (rc) { - err("%s - failed submitting read urb, error %d", __FUNCTION__, rc); - retval = rc; - goto exit; - } - rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev,0), - KL5KUSB105A_SIO_CONFIGURE, - USB_TYPE_VENDOR|USB_DIR_OUT|USB_RECIP_INTERFACE, - KL5KUSB105A_SIO_CONFIGURE_READ_ON, - 0, /* index */ - NULL, - 0, - KLSI_TIMEOUT); - if (rc < 0) { - err("Enabling read failed (error = %d)", rc); - retval = rc; - } else - dbg("%s - enabled reading", __FUNCTION__); + /* READ_ON and urb submission */ + FILL_BULK_URB(port->read_urb, serial->dev, + usb_rcvbulkpipe(serial->dev, + port->bulk_in_endpointAddress), + port->read_urb->transfer_buffer, + port->read_urb->transfer_buffer_length, + klsi_105_read_bulk_callback, + port); + port->read_urb->transfer_flags |= USB_QUEUE_BULK; - rc = klsi_105_get_line_state(serial, &line_state); - if (rc >= 0) { - priv->line_state = line_state; - dbg("%s - read line state 0x%lx", __FUNCTION__, line_state); - retval = 0; - } else - retval = rc; + rc = usb_submit_urb(port->read_urb); + if (rc) { + err("%s - failed submitting read urb, error %d", __FUNCTION__, rc); + retval = rc; + goto exit; } + rc = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev,0), + KL5KUSB105A_SIO_CONFIGURE, + USB_TYPE_VENDOR|USB_DIR_OUT|USB_RECIP_INTERFACE, + KL5KUSB105A_SIO_CONFIGURE_READ_ON, + 0, /* index */ + NULL, + 0, + KLSI_TIMEOUT); + if (rc < 0) { + err("Enabling read failed (error = %d)", rc); + retval = rc; + } else + dbg("%s - enabled reading", __FUNCTION__); + + rc = klsi_105_get_line_state(serial, &line_state); + if (rc >= 0) { + priv->line_state = line_state; + dbg("%s - read line state 0x%lx", __FUNCTION__, line_state); + retval = 0; + } else + retval = rc; + exit: - up (&port->sem); - return retval; } /* klsi_105_open */ @@ -490,6 +432,8 @@ struct usb_serial *serial; struct klsi_105_private *priv = (struct klsi_105_private *)port->private; + int rc; + dbg("%s port %d", __FUNCTION__, port->number); serial = get_usb_serial (port, __FUNCTION__); @@ -497,36 +441,26 @@ if(!serial) return; - down (&port->sem); - - --port->open_count; + /* send READ_OFF */ + rc = usb_control_msg (serial->dev, + usb_sndctrlpipe(serial->dev, 0), + KL5KUSB105A_SIO_CONFIGURE, + USB_TYPE_VENDOR | USB_DIR_OUT, + KL5KUSB105A_SIO_CONFIGURE_READ_OFF, + 0, /* index */ + NULL, 0, + KLSI_TIMEOUT); + if (rc < 0) + err("Disabling read failed (error = %d)", rc); - if (port->open_count <= 0) { - /* send READ_OFF */ - int rc = usb_control_msg(serial->dev, - usb_sndctrlpipe(serial->dev, 0), - KL5KUSB105A_SIO_CONFIGURE, - USB_TYPE_VENDOR | USB_DIR_OUT, - KL5KUSB105A_SIO_CONFIGURE_READ_OFF, - 0, /* index */ - NULL, 0, - KLSI_TIMEOUT); - if (rc < 0) - err("Disabling read failed (error = %d)", rc); - - /* shutdown our bulk reads and writes */ - usb_unlink_urb (port->write_urb); - usb_unlink_urb (port->read_urb); - /* unlink our write pool */ - /* FIXME */ - /* wgg - do I need this? I think so. */ - usb_unlink_urb (port->interrupt_in_urb); - port->active = 0; - info("kl5kusb105 port stats: %ld bytes in, %ld bytes out", priv->bytes_in, priv->bytes_out); - } - - up (&port->sem); - MOD_DEC_USE_COUNT; + /* shutdown our bulk reads and writes */ + usb_unlink_urb (port->write_urb); + usb_unlink_urb (port->read_urb); + /* unlink our write pool */ + /* FIXME */ + /* wgg - do I need this? I think so. */ + usb_unlink_urb (port->interrupt_in_urb); + info("kl5kusb105 port stats: %ld bytes in, %ld bytes out", priv->bytes_in, priv->bytes_out); } /* klsi_105_close */ @@ -536,6 +470,7 @@ */ #define KLSI_105_DATA_OFFSET 2 /* in the bulk urb data block */ + static int klsi_105_write (struct usb_serial_port *port, int from_user, const unsigned char *buf, int count) { @@ -547,9 +482,6 @@ dbg("%s - port %d", __FUNCTION__, port->number); - down (&port->sem); /* to lock against someone else trying to - take an URB we just selected from the pool */ - while (count > 0) { /* try to find a free urb (write 0 bytes if none) */ struct urb *urb = NULL; @@ -585,7 +517,6 @@ if (from_user) { if (copy_from_user(urb->transfer_buffer + KLSI_105_DATA_OFFSET, buf, size)) { - up (&port->sem); return -EFAULT; } } else { @@ -619,7 +550,6 @@ count -= size; } exit: - up (&port->sem); priv->bytes_out+=bytes_sent; return bytes_sent; /* that's how much we wrote */ @@ -1060,41 +990,27 @@ static void klsi_105_throttle (struct usb_serial_port *port) { - dbg("%s - port %d", __FUNCTION__, port->number); - - down (&port->sem); - usb_unlink_urb (port->read_urb); - - up (&port->sem); - - return; } + static void klsi_105_unthrottle (struct usb_serial_port *port) { int result; dbg("%s - port %d", __FUNCTION__, port->number); - down (&port->sem); - port->read_urb->dev = port->serial->dev; result = usb_submit_urb(port->read_urb); if (result) err("%s - failed submitting read urb, error %d", __FUNCTION__, result); - - up (&port->sem); - - return; } static int __init klsi_105_init (void) { - usb_serial_register (&palmconnect_device); usb_serial_register (&kl5kusb105d_device); info(DRIVER_DESC " " DRIVER_VERSION); @@ -1104,7 +1020,6 @@ static void __exit klsi_105_exit (void) { - usb_serial_deregister (&palmconnect_device); usb_serial_deregister (&kl5kusb105d_device); } diff -Nru a/drivers/usb/serial/kl5kusb105.h b/drivers/usb/serial/kl5kusb105.h --- a/drivers/usb/serial/kl5kusb105.h Thu Aug 29 13:54:32 2002 +++ b/drivers/usb/serial/kl5kusb105.h Thu Aug 29 13:54:32 2002 @@ -16,7 +16,7 @@ /* baud rates */ -typedef enum { +enum { kl5kusb105a_sio_b115200 = 0, kl5kusb105a_sio_b57600 = 1, kl5kusb105a_sio_b38400 = 2, @@ -27,7 +27,7 @@ kl5kusb105a_sio_b2400 = 9, /* unchecked */ kl5kusb105a_sio_b1200 = 0xa, /* unchecked */ kl5kusb105a_sio_b600 = 0xb /* unchecked */ -} KL5KUSB105A_SIO_baudrate_t; +}; /* data bits */ #define kl5kusb105a_dtb_7 7