diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-18 09:21:30 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-18 09:21:30 -0800 |
| commit | c86829ed35162a012126e1866317d7d726a73b21 (patch) | |
| tree | af937635ff9a141fbd3144306d30d18485d946a1 /usb | |
| parent | 83af9d4ec9d9dd35d6f24f3f50db513a50a5c83c (diff) | |
| download | patches-c86829ed35162a012126e1866317d7d726a73b21.tar.gz | |
2.6.15-rc1-git6 refresh (dropped a lot of usb patches)
Diffstat (limited to 'usb')
22 files changed, 0 insertions, 3536 deletions
diff --git a/usb/add-new-wacom-devices-to-usb-hid-core-list.patch b/usb/add-new-wacom-devices-to-usb-hid-core-list.patch deleted file mode 100644 index 2be7d853857d9b..00000000000000 --- a/usb/add-new-wacom-devices-to-usb-hid-core-list.patch +++ /dev/null @@ -1,60 +0,0 @@ -From pingc@wacom.com Thu Nov 3 15:35:09 2005 -Message-ID: <320348265B16DA11968C0060CF213AEB1C814C@wacom-nt2.wacom.com> -From: Ping Cheng <pingc@wacom.com> -To: <akpm@osdl.org> -Cc: <greg@kroah.com>, <dtor_core@ameritech.net>, <vojtech@suse.cz> -Subject: [patch 2/2] add new wacom devices to usb hid-core list -Date: Thu, 3 Nov 2005 15:30:52 -0800 - - -This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. - - -Signed-off-by: Ping Cheng <pingc@wacom.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/input/hid-core.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- gregkh-2.6.orig/drivers/usb/input/hid-core.c -+++ gregkh-2.6/drivers/usb/input/hid-core.c -@@ -1318,6 +1318,7 @@ void hid_init_reports(struct hid_device - #define USB_DEVICE_ID_WACOM_PTU 0x0003 - #define USB_DEVICE_ID_WACOM_INTUOS3 0x00B0 - #define USB_DEVICE_ID_WACOM_CINTIQ 0x003F -+#define USB_DEVICE_ID_WACOM_DTF 0x00C0 - - #define USB_VENDOR_ID_ACECAD 0x0460 - #define USB_DEVICE_ID_ACECAD_FLAIR 0x0004 -@@ -1524,6 +1525,9 @@ static struct hid_blacklist { - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 3, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 4, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 5, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 7, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 8, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 9, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 1, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 2, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 3, HID_QUIRK_IGNORE }, -@@ -1531,11 +1535,19 @@ static struct hid_blacklist { - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 5, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 7, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 1, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 2, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 3, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 4, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 5, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 6, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PTU, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 1, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 2, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 5, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_CINTIQ, HID_QUIRK_IGNORE }, -+ { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_DTF, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, - diff --git a/usb/usb-adapt-microtek-driver-to-new-scsi-features.patch b/usb/usb-adapt-microtek-driver-to-new-scsi-features.patch deleted file mode 100644 index 90ee4876649930..00000000000000 --- a/usb/usb-adapt-microtek-driver-to-new-scsi-features.patch +++ /dev/null @@ -1,141 +0,0 @@ -From oliver@neukum.org Sun Nov 13 05:15:44 2005 -From: Oliver Neukum <oliver@neukum.org> -To: greg@kroah.com, linux-usb-devel@lists.sourceforge.net -Subject: USB: Adapt microtek driver to new scsi features -Date: Sun, 13 Nov 2005 14:12:44 +0100 -Content-Disposition: inline -Message-Id: <200511131412.45156.oliver@neukum.org> - -the scsi layer now uses very short sg lists. This breaks the microtek -driver. Here is a patch fixes this and some other issues. - -Signed-off-by: Oliver Neukum <oliver@neukum.name> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/image/microtek.c | 35 +++++++++++++++++++++++++++-------- - drivers/usb/image/microtek.h | 2 +- - 2 files changed, 28 insertions(+), 9 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/image/microtek.c -+++ gregkh-2.6/drivers/usb/image/microtek.c -@@ -327,6 +327,18 @@ static inline void mts_urb_abort(struct - usb_kill_urb( desc->urb ); - } - -+static int mts_slave_alloc (struct scsi_device *s) -+{ -+ s->inquiry_len = 0x24; -+ return 0; -+} -+ -+static int mts_slave_configure (struct scsi_device *s) -+{ -+ blk_queue_dma_alignment(s->request_queue, (512 - 1)); -+ return 0; -+} -+ - static int mts_scsi_abort (Scsi_Cmnd *srb) - { - struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); -@@ -411,7 +423,7 @@ static void mts_transfer_done( struct ur - MTS_INT_INIT(); - - context->srb->result &= MTS_SCSI_ERR_MASK; -- context->srb->result |= (unsigned)context->status<<1; -+ context->srb->result |= (unsigned)(*context->scsi_status)<<1; - - mts_transfer_cleanup(transfer); - -@@ -427,7 +439,7 @@ static void mts_get_status( struct urb * - mts_int_submit_urb(transfer, - usb_rcvbulkpipe(context->instance->usb_dev, - context->instance->ep_response), -- &context->status, -+ context->scsi_status, - 1, - mts_transfer_done ); - } -@@ -481,7 +493,7 @@ static void mts_command_done( struct urb - context->data_pipe, - context->data, - context->data_length, -- context->srb->use_sg ? mts_do_sg : mts_data_done); -+ context->srb->use_sg > 1 ? mts_do_sg : mts_data_done); - } else { - mts_get_status(transfer); - } -@@ -627,7 +639,6 @@ int mts_scsi_queuecommand( Scsi_Cmnd *sr - callback(srb); - - } -- - out: - return err; - } -@@ -645,6 +656,9 @@ static struct scsi_host_template mts_scs - .cmd_per_lun = 1, - .use_clustering = 1, - .emulated = 1, -+ .slave_alloc = mts_slave_alloc, -+ .slave_configure = mts_slave_configure, -+ .max_sectors= 256, /* 128 K */ - }; - - struct vendor_product -@@ -771,8 +785,8 @@ static int mts_usb_probe(struct usb_inte - MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" ); - return -ENODEV; - } -- -- -+ -+ - new_desc = kzalloc(sizeof(struct mts_desc), GFP_KERNEL); - if (!new_desc) - goto out; -@@ -781,6 +795,10 @@ static int mts_usb_probe(struct usb_inte - if (!new_desc->urb) - goto out_kfree; - -+ new_desc->context.scsi_status = kmalloc(1, GFP_KERNEL); -+ if (!new_desc->context.scsi_status) -+ goto out_kfree2; -+ - new_desc->usb_dev = dev; - new_desc->usb_intf = intf; - init_MUTEX(&new_desc->lock); -@@ -817,6 +835,8 @@ static int mts_usb_probe(struct usb_inte - usb_set_intfdata(intf, new_desc); - return 0; - -+ out_kfree2: -+ kfree(new_desc->context.scsi_status); - out_free_urb: - usb_free_urb(new_desc->urb); - out_kfree: -@@ -836,6 +856,7 @@ static void mts_usb_disconnect (struct u - - scsi_host_put(desc->host); - usb_free_urb(desc->urb); -+ kfree(desc->context.scsi_status); - kfree(desc); - } - -@@ -856,5 +877,3 @@ module_exit(microtek_drv_exit); - MODULE_AUTHOR( DRIVER_AUTHOR ); - MODULE_DESCRIPTION( DRIVER_DESC ); - MODULE_LICENSE("GPL"); -- -- ---- gregkh-2.6.orig/drivers/usb/image/microtek.h -+++ gregkh-2.6/drivers/usb/image/microtek.h -@@ -22,7 +22,7 @@ struct mts_transfer_context - int data_pipe; - int fragment; - -- u8 status; /* status returned from ep_response after command completion */ -+ u8 *scsi_status; /* status returned from ep_response after command completion */ - }; - - diff --git a/usb/usb-cp2101-new-id.patch b/usb/usb-cp2101-new-id.patch deleted file mode 100644 index 66222eef5eecfe..00000000000000 --- a/usb/usb-cp2101-new-id.patch +++ /dev/null @@ -1,24 +0,0 @@ -From balatka@email.cz Mon Oct 31 08:12:23 2005 -Message-ID: <4365ECF0.7010208@email.cz> -Date: Mon, 31 Oct 2005 11:07:44 +0100 -From: Josef Balatka <balatka@email.cz> -To: gregkh@suse.de -Subject: cp2101.c: Jablotron usb serial interface identification - -Jablotron usb serial interface identification - -Signed-off-by: Josef Balatka <balatka@email.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - drivers/usb/serial/cp2101.c | 1 + - 1 file changed, 1 insertion(+) - ---- gregkh-2.6.orig/drivers/usb/serial/cp2101.c 2005-11-02 09:25:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/serial/cp2101.c 2005-11-02 12:04:11.000000000 -0800 -@@ -60,6 +60,7 @@ - { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */ - { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */ - { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */ -+ { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ - { } /* Terminating Entry */ - }; - diff --git a/usb/usb-delete-bluetty-leftovers.patch b/usb/usb-delete-bluetty-leftovers.patch deleted file mode 100644 index 0f303ecce22317..00000000000000 --- a/usb/usb-delete-bluetty-leftovers.patch +++ /dev/null @@ -1,90 +0,0 @@ -From marcel@holtmann.org Sat Oct 29 04:47:56 2005 -Subject: USB: Delete leftovers from bluetty driver -From: Marcel Holtmann <marcel@holtmann.org> -To: Greg K-H <greg@kroah.com> -Date: Sat, 29 Oct 2005 13:43:04 +0200 -Message-Id: <1130586184.5360.15.camel@blade> - -[PATCH] USB: Delete leftovers from bluetty driver - -This patch deletes the bluetooth.txt help file of the bluetty driver and -hands over its major device nodes for character devices to the RFCOMM TTY -implementation of the Bluetooth subsystem. - -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - Documentation/devices.txt | 12 +++++----- - Documentation/usb/bluetooth.txt | 44 ---------------------------------------- - 2 files changed, 6 insertions(+), 50 deletions(-) - ---- gregkh-2.6.orig/Documentation/devices.txt 2005-11-02 09:25:58.000000000 -0800 -+++ gregkh-2.6/Documentation/devices.txt 2005-11-02 10:28:12.000000000 -0800 -@@ -2917,14 +2917,14 @@ - 196 = /dev/dvb/adapter3/video0 first video decoder of fourth card - - --216 char USB BlueTooth devices -- 0 = /dev/ttyUB0 First USB BlueTooth device -- 1 = /dev/ttyUB1 Second USB BlueTooth device -+216 char Bluetooth RFCOMM TTY devices -+ 0 = /dev/rfcomm0 First Bluetooth RFCOMM TTY device -+ 1 = /dev/rfcomm1 Second Bluetooth RFCOMM TTY device - ... - --217 char USB BlueTooth devices (alternate devices) -- 0 = /dev/cuub0 Callout device for ttyUB0 -- 1 = /dev/cuub1 Callout device for ttyUB1 -+217 char Bluetooth RFCOMM TTY devices (alternate devices) -+ 0 = /dev/curf0 Callout device for rfcomm0 -+ 1 = /dev/curf1 Callout device for rfcomm1 - ... - - 218 char The Logical Company bus Unibus/Qbus adapters ---- gregkh-2.6.orig/Documentation/usb/bluetooth.txt 2005-08-28 16:41:01.000000000 -0700 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,44 +0,0 @@ --INTRODUCTION -- -- The USB Bluetooth driver supports any USB Bluetooth device. -- It currently works well with the Linux USB Bluetooth stack from Axis -- (available at http://developer.axis.com/software/bluetooth/ ) and -- has been rumored to work with other Linux USB Bluetooth stacks. -- -- --CONFIGURATION -- -- Currently the driver can handle up to 256 different USB Bluetooth -- devices at once. -- -- If you are not using devfs: -- The major number that the driver uses is 216 so to use the driver, -- create the following nodes: -- mknod /dev/ttyUB0 c 216 0 -- mknod /dev/ttyUB1 c 216 1 -- mknod /dev/ttyUB2 c 216 2 -- mknod /dev/ttyUB3 c 216 3 -- . -- . -- . -- mknod /dev/ttyUB254 c 216 254 -- mknod /dev/ttyUB255 c 216 255 -- -- If you are using devfs: -- The devices supported by this driver will show up as -- /dev/usb/ttub/{0,1,...} -- -- When the device is connected and recognized by the driver, the driver -- will print to the system log, which node the device has been bound to. -- -- --CONTACT: -- -- If anyone has any problems using this driver, please contact me, or -- join the Linux-USB mailing list (information on joining the mailing -- list, as well as a link to its searchable archive is at -- http://www.linux-usb.org/ ) -- -- --Greg Kroah-Hartman --greg@kroah.com diff --git a/usb/usb-delete-nokia_dku2.patch b/usb/usb-delete-nokia_dku2.patch deleted file mode 100644 index ec41b16b6fdbae..00000000000000 --- a/usb/usb-delete-nokia_dku2.patch +++ /dev/null @@ -1,188 +0,0 @@ -From foo@baz.org Wed Nov 16 13:31:19 2005 -Date: Wed, 16 Nov 2005 13:41:28 -0800 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: delete the nokia_dku2 driver - -It was causing too many problems, and this is not the proper type of -driver for this device. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/usb/serial/Kconfig | 9 -- - drivers/usb/serial/Makefile | 1 - drivers/usb/serial/nokia_dku2.c | 142 ---------------------------------------- - 3 files changed, 152 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/serial/Kconfig -+++ gregkh-2.6/drivers/usb/serial/Kconfig -@@ -394,15 +394,6 @@ config USB_SERIAL_MCT_U232 - To compile this driver as a module, choose M here: the - module will be called mct_u232. - --config USB_SERIAL_NOKIA_DKU2 -- tristate "USB Nokia DKU2 Driver" -- depends on USB_SERIAL -- help -- Say Y here if you want to use a Nokia DKU2 device. -- -- To compile this driver as a module, choose M here: the -- module will be called nokia_dku2. -- - config USB_SERIAL_PL2303 - tristate "USB Prolific 2303 Single Port Serial Driver" - depends on USB_SERIAL ---- gregkh-2.6.orig/drivers/usb/serial/Makefile -+++ gregkh-2.6/drivers/usb/serial/Makefile -@@ -31,7 +31,6 @@ obj-$(CONFIG_USB_SERIAL_KEYSPAN_PDA) += - obj-$(CONFIG_USB_SERIAL_KLSI) += kl5kusb105.o - obj-$(CONFIG_USB_SERIAL_KOBIL_SCT) += kobil_sct.o - obj-$(CONFIG_USB_SERIAL_MCT_U232) += mct_u232.o --obj-$(CONFIG_USB_SERIAL_NOKIA_DKU2) += nokia_dku2.o - obj-$(CONFIG_USB_SERIAL_OMNINET) += omninet.o - obj-$(CONFIG_USB_SERIAL_OPTION) += option.o - obj-$(CONFIG_USB_SERIAL_PL2303) += pl2303.o ---- gregkh-2.6.orig/drivers/usb/serial/nokia_dku2.c -+++ /dev/null -@@ -1,142 +0,0 @@ --/* -- * Nokia DKU2 USB driver -- * -- * Copyright (C) 2004 -- * Author: C Kemp -- * -- * This program is largely derived from work by the linux-usb group -- * and associated source files. Please see the usb/serial files for -- * individual credits and copyrights. -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * 20.09.2005 - Matthias Blaesing <matthias.blaesing@rwth-aachen.de> -- * Added short name to device structure to make driver load into kernel 2.6.13 -- * -- * 20.09.2005 - Matthias Blaesing <matthias.blaesing@rwth-aachen.de> -- * Added usb_deregister to exit code - to allow remove and reinsert of module -- */ -- -- --#include <linux/config.h> --#include <linux/kernel.h> --#include <linux/errno.h> --#include <linux/init.h> --#include <linux/slab.h> --#include <linux/tty.h> --#include <linux/tty_driver.h> --#include <linux/tty_flip.h> --#include <linux/module.h> --#include <linux/usb.h> --#include "usb-serial.h" -- -- --#define NOKIA_VENDOR_ID 0x0421 --#define NOKIA7600_PRODUCT_ID 0x0400 --#define NOKIA6230_PRODUCT_ID 0x040f --#define NOKIA6170_PRODUCT_ID 0x0416 --#define NOKIA6670_PRODUCT_ID 0x041d --#define NOKIA6680_PRODUCT_ID 0x041e --#define NOKIA6230i_PRODUCT_ID 0x0428 -- --#define NOKIA_AT_PORT 0x82 --#define NOKIA_FBUS_PORT 0x86 -- --/* -- * Version Information -- */ --#define DRIVER_VERSION "v0.2" --#define DRIVER_AUTHOR "C Kemp" --#define DRIVER_DESC "Nokia DKU2 Driver" -- --static struct usb_device_id id_table [] = { -- { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA7600_PRODUCT_ID) }, -- { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6230_PRODUCT_ID) }, -- { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6170_PRODUCT_ID) }, -- { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6670_PRODUCT_ID) }, -- { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6680_PRODUCT_ID) }, -- { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6230i_PRODUCT_ID) }, -- { } /* Terminating entry */ --}; --MODULE_DEVICE_TABLE(usb, id_table); -- --/* The only thing which makes this device different from a generic -- * device is that we have to set an alternative configuration to make -- * the relevant endpoints available. In 2.6 this is really easy... */ --static int nokia_probe(struct usb_serial *serial, -- const struct usb_device_id *id) --{ -- int retval = -ENODEV; -- -- if (serial->interface->altsetting[0].endpoint[0].desc.bEndpointAddress == NOKIA_AT_PORT) { -- /* the AT port */ -- dev_info(&serial->dev->dev, "Nokia AT Port:\n"); -- retval = 0; -- } else if (serial->interface->num_altsetting == 2 && -- serial->interface->altsetting[1].endpoint[0].desc.bEndpointAddress == NOKIA_FBUS_PORT) { -- /* the FBUS port */ -- dev_info(&serial->dev->dev, "Nokia FBUS Port:\n"); -- usb_set_interface(serial->dev, 10, 1); -- retval = 0; -- } -- -- return retval; --} -- --static struct usb_driver nokia_driver = { -- .owner = THIS_MODULE, -- .name = "nokia_dku2", -- .probe = usb_serial_probe, -- .disconnect = usb_serial_disconnect, -- .id_table = id_table, --}; -- --static struct usb_serial_driver nokia_serial_driver = { -- .driver = { -- .owner = THIS_MODULE, -- .name = "nokia_dku2", -- }, -- .description = "Nokia 7600/6230(i)/6170/66x0 DKU2 driver", -- .id_table = id_table, -- .num_interrupt_in = 1, -- .num_bulk_in = 1, -- .num_bulk_out = 1, -- .num_ports = 1, -- .probe = nokia_probe, --}; -- --static int __init nokia_init(void) --{ -- int retval; -- -- retval = usb_serial_register(&nokia_serial_driver); -- if (retval) -- return retval; -- -- retval = usb_register(&nokia_driver); -- if (retval) { -- usb_serial_deregister(&nokia_serial_driver); -- return retval; -- } -- -- info(DRIVER_VERSION " " DRIVER_AUTHOR); -- info(DRIVER_DESC); -- -- return retval; --} -- --static void __exit nokia_exit(void) --{ -- usb_deregister(&nokia_driver); -- usb_serial_deregister(&nokia_serial_driver); --} -- --module_init(nokia_init); --module_exit(nokia_exit); -- --MODULE_AUTHOR(DRIVER_AUTHOR); --MODULE_DESCRIPTION(DRIVER_DESC); --MODULE_LICENSE("GPL"); diff --git a/usb/usb-devio-warning-fix.patch b/usb/usb-devio-warning-fix.patch deleted file mode 100644 index a3afce81d0a898..00000000000000 --- a/usb/usb-devio-warning-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From akpm@osdl.org Mon Nov 14 23:38:45 2005 -Message-Id: <200511150751.jAF7p9fP022460@shell0.pdx.osdl.net> -To: akpm@osdl.org, greg@kroah.com, mm-commits@vger.kernel.org -From: akpm@osdl.org -Subject: usb devio warning fix -Date: Mon, 14 Nov 2005 23:50:53 -0800 - -From: Andrew Morton <akpm@osdl.org> - -drivers/usb/core/devio.c: In function `proc_ioctl_compat': -drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast - -Signed-off-by: Andrew Morton <akpm@osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/usb/core/devio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/usb/core/devio.c -+++ gregkh-2.6/drivers/usb/core/devio.c -@@ -1398,7 +1398,7 @@ static int proc_ioctl_compat(struct dev_ - struct usbdevfs_ioctl ctrl; - u32 udata; - -- uioc = compat_ptr(arg); -+ uioc = compat_ptr((long)arg); - if (get_user(ctrl.ifno, &uioc->ifno) || - get_user(ctrl.ioctl_code, &uioc->ioctl_code) || - __get_user(udata, &uioc->data)) diff --git a/usb/usb-fix-dummy_hcd-breakage.patch b/usb/usb-fix-dummy_hcd-breakage.patch deleted file mode 100644 index 2c7061fae869b3..00000000000000 --- a/usb/usb-fix-dummy_hcd-breakage.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Greg Kroah-Hartman <gregkh@suse.de> -Date: Mon Nov 14 11:43:50 2005 -0800 -Subject: USB: fix build breakage in dummy_hcd.c - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/dummy_hcd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/gadget/dummy_hcd.c -+++ gregkh-2.6/drivers/usb/gadget/dummy_hcd.c -@@ -944,7 +944,7 @@ static int dummy_udc_suspend (struct pla - set_link_state (dum); - spin_unlock_irq (&dum->lock); - -- dev->power.power_state = state; -+ dev->dev.power.power_state = state; - usb_hcd_poll_rh_status (dummy_to_hcd (dum)); - return 0; - } -@@ -1904,7 +1904,7 @@ static int dummy_hcd_probe (struct platf - struct usb_hcd *hcd; - int retval; - -- dev_info (dev, "%s, driver " DRIVER_VERSION "\n", driver_desc); -+ dev_info(&dev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc); - - hcd = usb_create_hcd (&dummy_hcd, &dev->dev, dev->dev.bus_id); - if (!hcd) diff --git a/usb/usb-fix-race-in-kaweth-disconnect.patch b/usb/usb-fix-race-in-kaweth-disconnect.patch deleted file mode 100644 index 14e8e6a3d2a0e1..00000000000000 --- a/usb/usb-fix-race-in-kaweth-disconnect.patch +++ /dev/null @@ -1,64 +0,0 @@ -From oliver@neukum.org Wed Nov 9 23:42:43 2005 -From: Oliver Neukum <oliver@neukum.org> -To: Greg KH <greg@kroah.com>, Herbert Xu <herbert@gondor.apana.org.au>, -Subject: USB: fix race in kaweth disconnect -Date: Thu, 10 Nov 2005 08:38:39 +0100 -Content-Disposition: inline -Message-Id: <200511100838.44635.oliver@neukum.org> - -From: Herbert Xu <herbert@gondor.apana.org.au> - -this patch from Herbert Xu fixes a race by moving termination of -the URBs into close() exclusively. Please apply. - -Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> -Signed-off-by: Oliver Neukum <oliver@neukum.name> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/net/kaweth.c | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/net/kaweth.c -+++ gregkh-2.6/drivers/usb/net/kaweth.c -@@ -219,7 +219,6 @@ struct kaweth_device - - __u32 status; - int end; -- int removed; - int suspend_lowmem_rx; - int suspend_lowmem_ctrl; - int linkstate; -@@ -699,6 +698,7 @@ static int kaweth_close(struct net_devic - - usb_kill_urb(kaweth->irq_urb); - usb_kill_urb(kaweth->rx_urb); -+ usb_kill_urb(kaweth->tx_urb); - - flush_scheduled_work(); - -@@ -750,13 +750,6 @@ static int kaweth_start_xmit(struct sk_b - - spin_lock(&kaweth->device_lock); - -- if (kaweth->removed) { -- /* our device is undergoing disconnection - we bail out */ -- spin_unlock(&kaweth->device_lock); -- dev_kfree_skb_irq(skb); -- return 0; -- } -- - kaweth_async_set_rx_mode(kaweth); - netif_stop_queue(net); - -@@ -1136,10 +1129,6 @@ static void kaweth_disconnect(struct usb - return; - } - netdev = kaweth->net; -- kaweth->removed = 1; -- usb_kill_urb(kaweth->irq_urb); -- usb_kill_urb(kaweth->rx_urb); -- usb_kill_urb(kaweth->tx_urb); - - kaweth_dbg("Unregistering net device"); - unregister_netdev(netdev); diff --git a/usb/usb-fix-unused-variable-warning.patch b/usb/usb-fix-unused-variable-warning.patch deleted file mode 100644 index f82e09060cd354..00000000000000 --- a/usb/usb-fix-unused-variable-warning.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dtor_core@ameritech.net Mon Oct 31 21:02:49 2005 -From: Dmitry Torokhov <dtor_core@ameritech.net> -To: Greg KH <gregkh@suse.de> -Subject: USB: fix 'unused variable' warning -Date: Mon, 31 Oct 2005 23:29:05 -0500 -Message-Id: <200510312329.05955.dtor_core@ameritech.net> - -USB: fix 'unused variable' warning - -Signed-off-by: Dmitry Torokhov <dtor@mail.ru> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - drivers/usb/core/message.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/core/message.c 2005-11-02 09:25:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/core/message.c 2005-11-02 10:28:05.000000000 -0800 -@@ -1457,12 +1457,11 @@ - */ - for (i = 0; i < nintf; ++i) { - struct usb_interface *intf = cp->interface[i]; -- struct usb_host_interface *alt = intf->cur_altsetting; - - dev_dbg (&dev->dev, - "adding %s (config #%d, interface %d)\n", - intf->dev.bus_id, configuration, -- alt->desc.bInterfaceNumber); -+ intf->cur_altsetting->desc.bInterfaceNumber); - ret = device_add (&intf->dev); - if (ret != 0) { - dev_err(&dev->dev, diff --git a/usb/usb-makefile-debug.patch b/usb/usb-makefile-debug.patch deleted file mode 100644 index d473a992c6a8ef..00000000000000 --- a/usb/usb-makefile-debug.patch +++ /dev/null @@ -1,554 +0,0 @@ -From foo@baz.org Wed Nov 16 13:31:19 2005 -Date: Wed, 16 Nov 2005 13:41:28 -0800 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: move CONFIG_USB_DEBUG checks into the Makefile - -This lets us remove a lot of code in the drivers that were all checking -the same thing. It also found some bugs in a few of the drivers, which -has been fixed up. - - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/atm/Makefile | 4 ++++ - drivers/usb/atm/usbatm.h | 5 ----- - drivers/usb/core/Makefile | 4 ++++ - drivers/usb/core/buffer.c | 8 -------- - drivers/usb/core/config.c | 5 ----- - drivers/usb/core/file.c | 6 ------ - drivers/usb/core/hcd-pci.c | 7 ------- - drivers/usb/core/hcd.c | 5 ----- - drivers/usb/core/hub.c | 5 ----- - drivers/usb/core/message.c | 7 ------- - drivers/usb/core/notify.c | 6 ------ - drivers/usb/core/sysfs.c | 7 ------- - drivers/usb/core/urb.c | 6 ------ - drivers/usb/core/usb.c | 7 ------- - drivers/usb/input/Makefile | 4 ++++ - drivers/usb/input/itmtouch.c | 7 ------- - drivers/usb/input/keyspan_remote.c | 5 +++-- - drivers/usb/input/mtouchusb.c | 7 ------- - drivers/usb/input/pid.c | 2 -- - drivers/usb/input/touchkitusb.c | 4 ---- - drivers/usb/misc/Makefile | 6 +++++- - drivers/usb/misc/auerswald.c | 1 - - drivers/usb/misc/phidgetservo.c | 3 --- - drivers/usb/misc/rio500.c | 2 +- - drivers/usb/misc/usbled.c | 3 --- - drivers/usb/misc/usbtest.c | 3 --- - drivers/usb/misc/uss720.c | 2 -- - drivers/usb/net/Makefile | 4 ++++ - drivers/usb/net/asix.c | 3 --- - drivers/usb/net/cdc_ether.c | 3 --- - drivers/usb/net/cdc_subset.c | 3 --- - drivers/usb/net/gl620a.c | 3 --- - drivers/usb/net/net1080.c | 3 --- - drivers/usb/net/pegasus.c | 2 -- - drivers/usb/net/plusb.c | 3 --- - drivers/usb/net/rndis_host.c | 3 --- - drivers/usb/net/usbnet.c | 3 --- - drivers/usb/net/zaurus.c | 3 --- - 38 files changed, 25 insertions(+), 139 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/core/Makefile -+++ gregkh-2.6/drivers/usb/core/Makefile -@@ -14,3 +14,7 @@ ifeq ($(CONFIG_USB_DEVICEFS),y) - endif - - obj-$(CONFIG_USB) += usbcore.o -+ -+ifeq ($(CONFIG_USB_DEBUG),y) -+EXTRA_CFLAGS += -DDEBUG -+endif ---- gregkh-2.6.orig/drivers/usb/core/buffer.c -+++ gregkh-2.6/drivers/usb/core/buffer.c -@@ -15,14 +15,6 @@ - #include <asm/scatterlist.h> - #include <linux/dma-mapping.h> - #include <linux/dmapool.h> -- -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif -- - #include <linux/usb.h> - #include "hcd.h" - ---- gregkh-2.6.orig/drivers/usb/core/config.c -+++ gregkh-2.6/drivers/usb/core/config.c -@@ -1,9 +1,4 @@ - #include <linux/config.h> -- --#ifdef CONFIG_USB_DEBUG --#define DEBUG --#endif -- - #include <linux/usb.h> - #include <linux/module.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/core/file.c -+++ gregkh-2.6/drivers/usb/core/file.c -@@ -19,12 +19,6 @@ - #include <linux/module.h> - #include <linux/spinlock.h> - #include <linux/errno.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif - #include <linux/usb.h> - - #include "usb.h" ---- gregkh-2.6.orig/drivers/usb/core/hcd-pci.c -+++ gregkh-2.6/drivers/usb/core/hcd-pci.c -@@ -17,13 +17,6 @@ - */ - - #include <linux/config.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif -- - #include <linux/kernel.h> - #include <linux/module.h> - #include <linux/pci.h> ---- gregkh-2.6.orig/drivers/usb/core/hcd.c -+++ gregkh-2.6/drivers/usb/core/hcd.c -@@ -23,11 +23,6 @@ - */ - - #include <linux/config.h> -- --#ifdef CONFIG_USB_DEBUG --#define DEBUG --#endif -- - #include <linux/module.h> - #include <linux/version.h> - #include <linux/kernel.h> ---- gregkh-2.6.orig/drivers/usb/core/hub.c -+++ gregkh-2.6/drivers/usb/core/hub.c -@@ -9,11 +9,6 @@ - */ - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif - #include <linux/kernel.h> - #include <linux/errno.h> - #include <linux/module.h> ---- gregkh-2.6.orig/drivers/usb/core/message.c -+++ gregkh-2.6/drivers/usb/core/message.c -@@ -3,13 +3,6 @@ - */ - - #include <linux/config.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif -- - #include <linux/pci.h> /* for scatterlist macros */ - #include <linux/usb.h> - #include <linux/module.h> ---- gregkh-2.6.orig/drivers/usb/core/notify.c -+++ gregkh-2.6/drivers/usb/core/notify.c -@@ -12,13 +12,7 @@ - #include <linux/config.h> - #include <linux/kernel.h> - #include <linux/notifier.h> --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif - #include <linux/usb.h> -- - #include "usb.h" - - ---- gregkh-2.6.orig/drivers/usb/core/sysfs.c -+++ gregkh-2.6/drivers/usb/core/sysfs.c -@@ -12,14 +12,7 @@ - - #include <linux/config.h> - #include <linux/kernel.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif - #include <linux/usb.h> -- - #include "usb.h" - - /* endpoint stuff */ ---- gregkh-2.6.orig/drivers/usb/core/urb.c -+++ gregkh-2.6/drivers/usb/core/urb.c -@@ -4,12 +4,6 @@ - #include <linux/bitops.h> - #include <linux/slab.h> - #include <linux/init.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif - #include <linux/usb.h> - #include "hcd.h" - ---- gregkh-2.6.orig/drivers/usb/core/usb.c -+++ gregkh-2.6/drivers/usb/core/usb.c -@@ -22,13 +22,6 @@ - */ - - #include <linux/config.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif -- - #include <linux/module.h> - #include <linux/string.h> - #include <linux/bitops.h> ---- gregkh-2.6.orig/drivers/usb/net/Makefile -+++ gregkh-2.6/drivers/usb/net/Makefile -@@ -16,3 +16,7 @@ obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_ - obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o - obj-$(CONFIG_USB_USBNET) += usbnet.o - obj-$(CONFIG_USB_ZD1201) += zd1201.o -+ -+ifeq ($(CONFIG_USB_DEBUG),y) -+EXTRA_CFLAGS += -DDEBUG -+endif ---- gregkh-2.6.orig/drivers/usb/net/asix.c -+++ gregkh-2.6/drivers/usb/net/asix.c -@@ -23,9 +23,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/kmod.h> - #include <linux/sched.h> ---- gregkh-2.6.orig/drivers/usb/net/cdc_ether.c -+++ gregkh-2.6/drivers/usb/net/cdc_ether.c -@@ -21,9 +21,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/sched.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/net/cdc_subset.c -+++ gregkh-2.6/drivers/usb/net/cdc_subset.c -@@ -18,9 +18,6 @@ - */ - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/kmod.h> - #include <linux/sched.h> ---- gregkh-2.6.orig/drivers/usb/net/gl620a.c -+++ gregkh-2.6/drivers/usb/net/gl620a.c -@@ -22,9 +22,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/sched.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/net/net1080.c -+++ gregkh-2.6/drivers/usb/net/net1080.c -@@ -21,9 +21,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/sched.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/net/pegasus.c -+++ gregkh-2.6/drivers/usb/net/pegasus.c -@@ -28,8 +28,6 @@ - * is out of the interrupt routine. - */ - --#undef DEBUG -- - #include <linux/sched.h> - #include <linux/slab.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/net/plusb.c -+++ gregkh-2.6/drivers/usb/net/plusb.c -@@ -21,9 +21,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/sched.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/net/rndis_host.c -+++ gregkh-2.6/drivers/usb/net/rndis_host.c -@@ -21,9 +21,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/sched.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/net/usbnet.c -+++ gregkh-2.6/drivers/usb/net/usbnet.c -@@ -34,9 +34,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/sched.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/net/zaurus.c -+++ gregkh-2.6/drivers/usb/net/zaurus.c -@@ -21,9 +21,6 @@ - // #define VERBOSE // more; success messages - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --# define DEBUG --#endif - #include <linux/module.h> - #include <linux/sched.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/input/Makefile -+++ gregkh-2.6/drivers/usb/input/Makefile -@@ -42,3 +42,7 @@ obj-$(CONFIG_USB_ACECAD) += acecad.o - obj-$(CONFIG_USB_YEALINK) += yealink.o - obj-$(CONFIG_USB_XPAD) += xpad.o - obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o -+ -+ifeq ($(CONFIG_USB_DEBUG),y) -+EXTRA_CFLAGS += -DDEBUG -+endif ---- gregkh-2.6.orig/drivers/usb/input/itmtouch.c -+++ gregkh-2.6/drivers/usb/input/itmtouch.c -@@ -40,13 +40,6 @@ - *****************************************************************************/ - - #include <linux/config.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif -- - #include <linux/kernel.h> - #include <linux/slab.h> - #include <linux/input.h> ---- gregkh-2.6.orig/drivers/usb/input/mtouchusb.c -+++ gregkh-2.6/drivers/usb/input/mtouchusb.c -@@ -40,13 +40,6 @@ - *****************************************************************************/ - - #include <linux/config.h> -- --#ifdef CONFIG_USB_DEBUG -- #define DEBUG --#else -- #undef DEBUG --#endif -- - #include <linux/kernel.h> - #include <linux/slab.h> - #include <linux/input.h> ---- gregkh-2.6.orig/drivers/usb/input/touchkitusb.c -+++ gregkh-2.6/drivers/usb/input/touchkitusb.c -@@ -30,10 +30,6 @@ - #include <linux/input.h> - #include <linux/module.h> - #include <linux/init.h> -- --#if !defined(DEBUG) && defined(CONFIG_USB_DEBUG) --#define DEBUG --#endif - #include <linux/usb.h> - #include <linux/usb_input.h> - ---- gregkh-2.6.orig/drivers/usb/input/pid.c -+++ gregkh-2.6/drivers/usb/input/pid.c -@@ -37,8 +37,6 @@ - #include "hid.h" - #include "pid.h" - --#define DEBUG -- - #define CHECK_OWNERSHIP(i, hid_pid) \ - ((i) < FF_EFFECTS_MAX && i >= 0 && \ - test_bit(FF_PID_FLAGS_USED, &hid_pid->effects[(i)].flags) && \ ---- gregkh-2.6.orig/drivers/usb/input/keyspan_remote.c -+++ gregkh-2.6/drivers/usb/input/keyspan_remote.c -@@ -160,7 +160,8 @@ static int keyspan_load_tester(struct us - * though so it's not too big a deal - */ - if (dev->data.pos >= dev->data.len) { -- dev_dbg(&dev->udev, "%s - Error ran out of data. pos: %d, len: %d\n", -+ dev_dbg(&dev->udev->dev, -+ "%s - Error ran out of data. pos: %d, len: %d\n", - __FUNCTION__, dev->data.pos, dev->data.len); - return -1; - } -@@ -306,7 +307,7 @@ static void keyspan_check_data(struct us - err("Bad message recieved, no stop bit found.\n"); - } - -- dev_dbg(&remote->udev, -+ dev_dbg(&remote->udev->dev, - "%s found valid message: system: %d, button: %d, toggle: %d\n", - __FUNCTION__, message.system, message.button, message.toggle); - ---- gregkh-2.6.orig/drivers/usb/misc/Makefile -+++ gregkh-2.6/drivers/usb/misc/Makefile -@@ -18,4 +18,8 @@ obj-$(CONFIG_USB_RIO500) += rio500.o - obj-$(CONFIG_USB_TEST) += usbtest.o - obj-$(CONFIG_USB_USS720) += uss720.o - --obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ -\ No newline at end of file -+obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ -+ -+ifeq ($(CONFIG_USB_DEBUG),y) -+EXTRA_CFLAGS += -DDEBUG -+endif ---- gregkh-2.6.orig/drivers/usb/misc/phidgetservo.c -+++ gregkh-2.6/drivers/usb/misc/phidgetservo.c -@@ -26,9 +26,6 @@ - */ - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG --#define DEBUG 1 --#endif - #include <linux/kernel.h> - #include <linux/errno.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/misc/usbled.c -+++ gregkh-2.6/drivers/usb/misc/usbled.c -@@ -10,9 +10,6 @@ - */ - - #include <linux/config.h> --#ifdef CONFIG_USB_DEBUG -- #define DEBUG 1 --#endif - #include <linux/kernel.h> - #include <linux/errno.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/misc/usbtest.c -+++ gregkh-2.6/drivers/usb/misc/usbtest.c -@@ -1,7 +1,4 @@ - #include <linux/config.h> --#if !defined (DEBUG) && defined (CONFIG_USB_DEBUG) --# define DEBUG --#endif - #include <linux/kernel.h> - #include <linux/errno.h> - #include <linux/init.h> ---- gregkh-2.6.orig/drivers/usb/misc/auerswald.c -+++ gregkh-2.6/drivers/usb/misc/auerswald.c -@@ -30,7 +30,6 @@ - #include <linux/module.h> - #include <linux/init.h> - #include <linux/wait.h> --#undef DEBUG /* include debug macros until it's done */ - #include <linux/usb.h> - - /*-------------------------------------------------------------------*/ ---- gregkh-2.6.orig/drivers/usb/misc/rio500.c -+++ gregkh-2.6/drivers/usb/misc/rio500.c -@@ -393,7 +393,7 @@ read_rio(struct file *file, char __user - ibuf, this_read, &partial, - 8000); - -- dbg(KERN_DEBUG "read stats: result:%d this_read:%u partial:%u", -+ dbg("read stats: result:%d this_read:%u partial:%u", - result, this_read, partial); - - if (partial) { ---- gregkh-2.6.orig/drivers/usb/misc/uss720.c -+++ gregkh-2.6/drivers/usb/misc/uss720.c -@@ -41,8 +41,6 @@ - - /*****************************************************************************/ - --#define DEBUG -- - #include <linux/module.h> - #include <linux/socket.h> - #include <linux/parport.h> ---- gregkh-2.6.orig/drivers/usb/atm/Makefile -+++ gregkh-2.6/drivers/usb/atm/Makefile -@@ -6,3 +6,7 @@ obj-$(CONFIG_USB_CXACRU) += cxacru.o - obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o - obj-$(CONFIG_USB_ATM) += usbatm.o - obj-$(CONFIG_USB_XUSBATM) += xusbatm.o -+ -+ifeq ($(CONFIG_USB_DEBUG),y) -+EXTRA_CFLAGS += -DDEBUG -+endif ---- gregkh-2.6.orig/drivers/usb/atm/usbatm.h -+++ gregkh-2.6/drivers/usb/atm/usbatm.h -@@ -27,14 +27,9 @@ - #include <linux/config.h> - - /* --#define DEBUG - #define VERBOSE_DEBUG - */ - --#if !defined (DEBUG) && defined (CONFIG_USB_DEBUG) --# define DEBUG --#endif -- - #include <asm/semaphore.h> - #include <linux/atm.h> - #include <linux/atmdev.h> diff --git a/usb/usb-maxtor-onetouch-button-support-for-older-drives.patch b/usb/usb-maxtor-onetouch-button-support-for-older-drives.patch deleted file mode 100644 index 6ded52722c9e59..00000000000000 --- a/usb/usb-maxtor-onetouch-button-support-for-older-drives.patch +++ /dev/null @@ -1,34 +0,0 @@ -From linux-usb-devel-admin@lists.sourceforge.net Mon Nov 14 05:37:11 2005 -From: Antti Andreimann <Antti.Andreimann@mail.ee> -Message-Id: <1131943956.13282.62.camel@localhost.localdomain> -Subject: USB: Maxtor OneTouch button support for older drives -Date: Mon, 14 Nov 2005 06:52:36 +0200 - - -This small patch adds a device ID used by older Maxtor OneTouch drives -(the ones with blue face-plate instead of the fancy silver one used in -newer models). The button on those drives works well with the current -driver. - - -From: Antti Andreimann <Antti.Andreimann@mail.ee> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 5 +++++ - 1 file changed, 5 insertions(+) - ---- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h -+++ gregkh-2.6/drivers/usb/storage/unusual_devs.h -@@ -1003,6 +1003,11 @@ UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xf - * - */ - #ifdef CONFIG_USB_STORAGE_ONETOUCH -+ UNUSUAL_DEV( 0x0d49, 0x7000, 0x0000, 0x9999, -+ "Maxtor", -+ "OneTouch External Harddrive", -+ US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input, -+ 0), - UNUSUAL_DEV( 0x0d49, 0x7010, 0x0000, 0x9999, - "Maxtor", - "OneTouch External Harddrive", diff --git a/usb/usb-ohci-lh7a404-platform-device-conversion-fixup.patch b/usb/usb-ohci-lh7a404-platform-device-conversion-fixup.patch deleted file mode 100644 index c506b53ef7c738..00000000000000 --- a/usb/usb-ohci-lh7a404-platform-device-conversion-fixup.patch +++ /dev/null @@ -1,28 +0,0 @@ -From rpurdie@rpsys.net Mon Nov 14 10:09:23 2005 -From: Richard Purdie <rpurdie@rpsys.net> -To: Greg KH <gregkh@suse.de> -Date: Mon, 14 Nov 2005 17:46:56 +0000 -Subject: USB: OHCI lh7a404 platform device conversion fixup -Message-Id: <1131990416.7590.6.camel@localhost.localdomain> - -Fix an error in the OHCI lh7a404 driver after the platform device -conversion. - -Signed-off-by: Richard Purdie <rpurdie@rpsys.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ohci-lh7a404.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/usb/host/ohci-lh7a404.c -+++ gregkh-2.6/drivers/usb/host/ohci-lh7a404.c -@@ -219,7 +219,7 @@ static int ohci_hcd_lh7a404_drv_probe(st - - static int ohci_hcd_lh7a404_drv_remove(struct platform_device *pdev) - { -- struct usb_hcd *hcd = platform_get_drvdata(dev); -+ struct usb_hcd *hcd = platform_get_drvdata(pdev); - - usb_hcd_lh7a404_remove(hcd, pdev); - return 0; diff --git a/usb/usb-onetouch-doesn-t-suspend-yet.patch b/usb/usb-onetouch-doesn-t-suspend-yet.patch deleted file mode 100644 index 6c4cc59dee2281..00000000000000 --- a/usb/usb-onetouch-doesn-t-suspend-yet.patch +++ /dev/null @@ -1,31 +0,0 @@ -From david-b@pacbell.net Mon Nov 7 20:50:51 2005 -From: David Brownell <david-b@pacbell.net> -To: Greg KH <greg@kroah.com> -Subject: USB: onetouch doesn't suspend yet -Date: Mon, 7 Nov 2005 20:43:16 -0800 -Cc: linux-usb-devel@lists.sourceforge.net -Message-Id: <200511072043.16227.david-b@pacbell.net> - - -The onetouch support doesn't suspend correctly (leaves an interrupt -URB posted, instead of unlinking it) so for now just disable it -when PM is in the air. - -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/usb/storage/Kconfig -+++ gregkh-2.6/drivers/usb/storage/Kconfig -@@ -115,7 +115,7 @@ config USB_STORAGE_JUMPSHOT - - config USB_STORAGE_ONETOUCH - bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)" -- depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL -+ depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM - help - Say Y here to include additional code to support the Maxtor OneTouch - USB hard drive's onetouch button. diff --git a/usb/usb-pl2303-adds-new-ids.patch b/usb/usb-pl2303-adds-new-ids.patch deleted file mode 100644 index 5f808dba657bbb..00000000000000 --- a/usb/usb-pl2303-adds-new-ids.patch +++ /dev/null @@ -1,43 +0,0 @@ -From lcapitulino@mandriva.com.br Fri Nov 11 18:56:30 2005 -Date: Fri, 11 Nov 2005 17:25:34 -0200 -From: Luiz Fernando Capitulino <lcapitulino@mandriva.com.br> -To: gregkh@suse.de -Subject: USB: pl2303: adds new IDs. -Message-Id: <20051111172534.4645e0b7.lcapitulino@mandriva.com.br> - - -This patch adds two new Siemens mobiles IDs for the pl2303 driver. - -Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/serial/pl2303.c | 2 ++ - drivers/usb/serial/pl2303.h | 2 ++ - 2 files changed, 4 insertions(+) - ---- gregkh-2.6.orig/drivers/usb/serial/pl2303.c -+++ gregkh-2.6/drivers/usb/serial/pl2303.c -@@ -71,7 +71,9 @@ static struct usb_device_id id_table [] - { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, - { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) }, - { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_ID) }, -+ { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_SX1) }, - { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) }, -+ { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) }, - { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) }, - { USB_DEVICE( NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID ) }, - { } /* Terminating entry */ ---- gregkh-2.6.orig/drivers/usb/serial/pl2303.h -+++ gregkh-2.6/drivers/usb/serial/pl2303.h -@@ -54,7 +54,9 @@ - #define SAMSUNG_PRODUCT_ID 0x8001 - - #define SIEMENS_VENDOR_ID 0x11f5 -+#define SIEMENS_PRODUCT_ID_SX1 0x0001 - #define SIEMENS_PRODUCT_ID_X65 0x0003 -+#define SIEMENS_PRODUCT_ID_X75 0x0004 - - #define SYNTECH_VENDOR_ID 0x0745 - #define SYNTECH_PRODUCT_ID 0x0001 diff --git a/usb/usb-pl2303-updates-pl2303_update_line_status.patch b/usb/usb-pl2303-updates-pl2303_update_line_status.patch deleted file mode 100644 index 9705f106495cbc..00000000000000 --- a/usb/usb-pl2303-updates-pl2303_update_line_status.patch +++ /dev/null @@ -1,31 +0,0 @@ -From lcapitulino@mandriva.com.br Fri Nov 11 18:56:30 2005 -Date: Fri, 11 Nov 2005 17:25:57 -0200 -From: Luiz Fernando Capitulino <lcapitulino@mandriva.com.br> -To: gregkh@suse.de -Subject: USB: pl2303: updates pl2303_update_line_status() -Message-Id: <20051111172557.64ed6d7a.lcapitulino@mandriva.com.br> - - -Updates pl2303_update_line_status() to handle X75 and SX1 Siemens mobiles - -Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/serial/pl2303.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/usb/serial/pl2303.c -+++ gregkh-2.6/drivers/usb/serial/pl2303.c -@@ -813,7 +813,9 @@ static void pl2303_update_line_status(st - u8 length = UART_STATE; - - if ((le16_to_cpu(port->serial->dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) && -- (le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X65)) { -+ (le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X65 || -+ le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_SX1 || -+ le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X75)) { - length = 1; - status_idx = 0; - } diff --git a/usb/usb-serial-anydata.patch b/usb/usb-serial-anydata.patch deleted file mode 100644 index 137e9a515d0919..00000000000000 --- a/usb/usb-serial-anydata.patch +++ /dev/null @@ -1,170 +0,0 @@ - drivers/usb/serial/Kconfig | 9 +++ - drivers/usb/serial/Makefile | 1 - drivers/usb/serial/anydata.c | 123 +++++++++++++++++++++++++++++++++++++++++++ - drivers/usb/serial/generic.c | 1 - 4 files changed, 134 insertions(+) - ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gregkh-2.6/drivers/usb/serial/anydata.c 2005-11-02 15:12:28.000000000 -0800 -@@ -0,0 +1,123 @@ -+/* -+ * AnyData CDMA Serial USB driver -+ * -+ * Copyright (C) 2005 Greg Kroah-Hartman <gregkh@suse.de> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License version -+ * 2 as published by the Free Software Foundation. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/tty.h> -+#include <linux/module.h> -+#include <linux/usb.h> -+#include "usb-serial.h" -+ -+static struct usb_device_id id_table [] = { -+ { USB_DEVICE(0x16d5, 0x6501) }, /* AirData CDMA device */ -+ { }, -+}; -+MODULE_DEVICE_TABLE(usb, id_table); -+ -+/* if overridden by the user, then use their value for the size of the -+ * read and write urbs */ -+static int buffer_size; -+static int debug; -+ -+static struct usb_driver anydata_driver = { -+ .owner = THIS_MODULE, -+ .name = "anydata", -+ .probe = usb_serial_probe, -+ .disconnect = usb_serial_disconnect, -+ .id_table = id_table, -+}; -+ -+static int anydata_open(struct usb_serial_port *port, struct file *filp) -+{ -+ char *buffer; -+ int result = 0; -+ -+ dbg("%s - port %d", __FUNCTION__, port->number); -+ -+ if (buffer_size) { -+ /* override the default buffer sizes */ -+ buffer = kmalloc(buffer_size, GFP_KERNEL); -+ if (!buffer) { -+ dev_err(&port->dev, "%s - out of memory.\n", -+ __FUNCTION__); -+ return -ENOMEM; -+ } -+ kfree (port->read_urb->transfer_buffer); -+ port->read_urb->transfer_buffer = buffer; -+ port->read_urb->transfer_buffer_length = buffer_size; -+ -+ buffer = kmalloc(buffer_size, GFP_KERNEL); -+ if (!buffer) { -+ dev_err(&port->dev, "%s - out of memory.\n", -+ __FUNCTION__); -+ return -ENOMEM; -+ } -+ kfree (port->write_urb->transfer_buffer); -+ port->write_urb->transfer_buffer = buffer; -+ port->write_urb->transfer_buffer_length = buffer_size; -+ port->bulk_out_size = buffer_size; -+ } -+ -+ /* Start reading from the device */ -+ usb_fill_bulk_urb(port->read_urb, port->serial->dev, -+ usb_rcvbulkpipe(port->serial->dev, -+ port->bulk_in_endpointAddress), -+ port->read_urb->transfer_buffer, -+ port->read_urb->transfer_buffer_length, -+ usb_serial_generic_write_bulk_callback, port); -+ 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); -+ -+ return result; -+} -+ -+static struct usb_serial_driver anydata_device = { -+ .driver = { -+ .owner = THIS_MODULE, -+ .name = "anydata", -+ }, -+ .id_table = id_table, -+ .num_interrupt_in = NUM_DONT_CARE, -+ .num_bulk_in = NUM_DONT_CARE, -+ .num_bulk_out = NUM_DONT_CARE, -+ .num_ports = 1, -+ .open = anydata_open, -+}; -+ -+static int __init anydata_init(void) -+{ -+ int retval; -+ -+ retval = usb_serial_register(&anydata_device); -+ if (retval) -+ return retval; -+ retval = usb_register(&anydata_driver); -+ if (retval) -+ usb_serial_deregister(&anydata_device); -+ return retval; -+} -+ -+static void __exit anydata_exit(void) -+{ -+ usb_deregister(&anydata_driver); -+ usb_serial_deregister(&anydata_device); -+} -+ -+module_init(anydata_init); -+module_exit(anydata_exit); -+MODULE_LICENSE("GPL"); -+ -+module_param(debug, bool, S_IRUGO | S_IWUSR); -+MODULE_PARM_DESC(debug, "Debug enabled or not"); -+module_param(buffer_size, int, 0); -+MODULE_PARM_DESC(buffer_size, "Size of the transfer buffers"); ---- gregkh-2.6.orig/drivers/usb/serial/Kconfig 2005-11-02 09:25:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/serial/Kconfig 2005-11-02 15:04:05.000000000 -0800 -@@ -62,6 +62,15 @@ - To compile this driver as a module, choose M here: the - module will be called airprime. - -+config USB_SERIAL_ANYDATA -+ tristate "USB AnyData CDMA Wireless Driver" -+ depends on USB_SERIAL -+ help -+ Say Y here if you want to use a AnyData CDMA device. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called anydata. -+ - config USB_SERIAL_BELKIN - tristate "USB Belkin and Peracom Single Port Serial Driver" - depends on USB_SERIAL ---- gregkh-2.6.orig/drivers/usb/serial/Makefile 2005-11-02 09:25:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/serial/Makefile 2005-11-02 15:03:22.000000000 -0800 -@@ -12,6 +12,7 @@ - usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y) - - obj-$(CONFIG_USB_SERIAL_AIRPRIME) += airprime.o -+obj-$(CONFIG_USB_SERIAL_ANYDATA) += anydata.o - obj-$(CONFIG_USB_SERIAL_BELKIN) += belkin_sa.o - obj-$(CONFIG_USB_SERIAL_CP2101) += cp2101.o - obj-$(CONFIG_USB_SERIAL_CYBERJACK) += cyberjack.o ---- gregkh-2.6.orig/drivers/usb/serial/generic.c 2005-11-02 09:25:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/serial/generic.c 2005-11-02 15:16:46.000000000 -0800 -@@ -309,6 +309,7 @@ - - schedule_work(&port->work); - } -+EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback); - - void usb_serial_generic_shutdown (struct usb_serial *serial) - { diff --git a/usb/usb-serial-history-not-old.patch b/usb/usb-serial-history-not-old.patch deleted file mode 100644 index 8f6475c3a8fafc..00000000000000 --- a/usb/usb-serial-history-not-old.patch +++ /dev/null @@ -1,1480 +0,0 @@ -From foo@baz.com Sat Nov 12 18:32:29 2005 -Date: Sat, 12 Nov 2005 17:25:26 -0800 -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB Serial: rename ChangeLog.old - -People are complaining about a .old file in the tree. So rename -drivers/usb/serial/ChangeLog.old to ChangeLog.history. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - drivers/usb/serial/ChangeLog.history | 730 +++++++++++++++++++++++++++++++++++ - drivers/usb/serial/ChangeLog.old | 730 ----------------------------------- - 2 files changed, 730 insertions(+), 730 deletions(-) - ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gregkh-2.6/drivers/usb/serial/ChangeLog.history 2005-11-12 20:51:52.000000000 -0800 -@@ -0,0 +1,730 @@ -+This is the contents of some of the drivers/usb/serial/ files that had old -+changelog comments. They were quite old, and out of date, and we don't keep -+them anymore, so I've put them here, away from the source files, in case -+people still care to see them. -+ -+- Greg Kroah-Hartman <greg@kroah.com> October 20, 2005 -+ -+----------------------------------------------------------------------- -+usb-serial.h Change Log comments: -+ -+ (03/26/2002) gkh -+ removed the port->tty check from port_paranoia_check() due to serial -+ consoles not having a tty device assigned to them. -+ -+ (12/03/2001) gkh -+ removed active from the port structure. -+ added documentation to the usb_serial_device_type structure -+ -+ (10/10/2001) gkh -+ added vendor and product to serial structure. Needed to determine device -+ owner when the device is disconnected. -+ -+ (05/30/2001) gkh -+ added sem to port structure and removed port_lock -+ -+ (10/05/2000) gkh -+ Added interrupt_in_endpointAddress and bulk_in_endpointAddress to help -+ fix bug with urb->dev not being set properly, now that the usb core -+ needs it. -+ -+ (09/11/2000) gkh -+ Added usb_serial_debug_data function to help get rid of #DEBUG in the -+ drivers. -+ -+ (08/28/2000) gkh -+ Added port_lock to port structure. -+ -+ (08/08/2000) gkh -+ Added open_count to port structure. -+ -+ (07/23/2000) gkh -+ Added bulk_out_endpointAddress to port structure. -+ -+ (07/19/2000) gkh, pberger, and borchers -+ Modifications to allow usb-serial drivers to be modules. -+ -+----------------------------------------------------------------------- -+usb-serial.c Change Log comments: -+ -+ (12/10/2002) gkh -+ Split the ports off into their own struct device, and added a -+ usb-serial bus driver. -+ -+ (11/19/2002) gkh -+ removed a few #ifdefs for the generic code and cleaned up the failure -+ logic in initialization. -+ -+ (10/02/2002) gkh -+ moved the console code to console.c and out of this file. -+ -+ (06/05/2002) gkh -+ moved location of startup() call in serial_probe() until after all -+ of the port information and endpoints are initialized. This makes -+ things easier for some drivers. -+ -+ (04/10/2002) gkh -+ added serial_read_proc function which creates a -+ /proc/tty/driver/usb-serial file. -+ -+ (03/27/2002) gkh -+ Got USB serial console code working properly and merged into the main -+ version of the tree. Thanks to Randy Dunlap for the initial version -+ of this code, and for pushing me to finish it up. -+ The USB serial console works with any usb serial driver device. -+ -+ (03/21/2002) gkh -+ Moved all manipulation of port->open_count into the core. Now the -+ individual driver's open and close functions are called only when the -+ first open() and last close() is called. Making the drivers a bit -+ smaller and simpler. -+ Fixed a bug if a driver didn't have the owner field set. -+ -+ (02/26/2002) gkh -+ Moved all locking into the main serial_* functions, instead of having -+ the individual drivers have to grab the port semaphore. This should -+ reduce races. -+ Reworked the MOD_INC logic a bit to always increment and decrement, even -+ if the generic driver is being used. -+ -+ (10/10/2001) gkh -+ usb_serial_disconnect() now sets the serial->dev pointer is to NULL to -+ help prevent child drivers from accessing the device since it is now -+ gone. -+ -+ (09/13/2001) gkh -+ Moved generic driver initialize after we have registered with the USB -+ core. Thanks to Randy Dunlap for pointing this problem out. -+ -+ (07/03/2001) gkh -+ Fixed module paramater size. Thanks to John Brockmeyer for the pointer. -+ Fixed vendor and product getting defined through the MODULE_PARM macro -+ if the Generic driver wasn't compiled in. -+ Fixed problem with generic_shutdown() not being called for drivers that -+ don't have a shutdown() function. -+ -+ (06/06/2001) gkh -+ added evil hack that is needed for the prolific pl2303 device due to the -+ crazy way its endpoints are set up. -+ -+ (05/30/2001) gkh -+ switched from using spinlock to a semaphore, which fixes lots of problems. -+ -+ (04/08/2001) gb -+ Identify version on module load. -+ -+ 2001_02_05 gkh -+ Fixed buffer overflows bug with the generic serial driver. Thanks to -+ Todd Squires <squirest@ct0.com> for fixing this. -+ -+ (01/10/2001) gkh -+ Fixed bug where the generic serial adaptor grabbed _any_ device that was -+ offered to it. -+ -+ (12/12/2000) gkh -+ Removed MOD_INC and MOD_DEC from poll and disconnect functions, and -+ moved them to the serial_open and serial_close functions. -+ Also fixed bug with there not being a MOD_DEC for the generic driver -+ (thanks to Gary Brubaker for finding this.) -+ -+ (11/29/2000) gkh -+ Small NULL pointer initialization cleanup which saves a bit of disk image -+ -+ (11/01/2000) Adam J. Richter -+ instead of using idVendor/idProduct pairs, usb serial drivers -+ now identify their hardware interest with usb_device_id tables, -+ which they usually have anyhow for use with MODULE_DEVICE_TABLE. -+ -+ (10/05/2000) gkh -+ Fixed bug with urb->dev not being set properly, now that the usb -+ core needs it. -+ -+ (09/11/2000) gkh -+ Removed DEBUG #ifdefs with call to usb_serial_debug_data -+ -+ (08/28/2000) gkh -+ Added port_lock to port structure. -+ Added locks for SMP safeness to generic driver -+ Fixed the ability to open a generic device's port more than once. -+ -+ (07/23/2000) gkh -+ Added bulk_out_endpointAddress to port structure. -+ -+ (07/19/2000) gkh, pberger, and borchers -+ Modifications to allow usb-serial drivers to be modules. -+ -+ (07/03/2000) gkh -+ Added more debugging to serial_ioctl call -+ -+ (06/25/2000) gkh -+ Changed generic_write_bulk_callback to not call wake_up_interruptible -+ directly, but to have port_softint do it at a safer time. -+ -+ (06/23/2000) gkh -+ Cleaned up debugging statements in a quest to find UHCI timeout bug. -+ -+ (05/22/2000) gkh -+ Changed the makefile, enabling the big CONFIG_USB_SERIAL_SOMTHING to be -+ removed from the individual device source files. -+ -+ (05/03/2000) gkh -+ Added the Digi Acceleport driver from Al Borchers and Peter Berger. -+ -+ (05/02/2000) gkh -+ Changed devfs and tty register code to work properly now. This was based on -+ the ACM driver changes by Vojtech Pavlik. -+ -+ (04/27/2000) Ryan VanderBijl -+ Put calls to *_paranoia_checks into one function. -+ -+ (04/23/2000) gkh -+ Fixed bug that Randy Dunlap found for Generic devices with no bulk out ports. -+ Moved when the startup code printed out the devices that are supported. -+ -+ (04/19/2000) gkh -+ Added driver for ZyXEL omni.net lcd plus ISDN TA -+ Made startup info message specify which drivers were compiled in. -+ -+ (04/03/2000) gkh -+ Changed the probe process to remove the module unload races. -+ Changed where the tty layer gets initialized to have devfs work nicer. -+ Added initial devfs support. -+ -+ (03/26/2000) gkh -+ Split driver up into device specific pieces. -+ -+ (03/19/2000) gkh -+ Fixed oops that could happen when device was removed while a program -+ was talking to the device. -+ Removed the static urbs and now all urbs are created and destroyed -+ dynamically. -+ Reworked the internal interface. Now everything is based on the -+ usb_serial_port structure instead of the larger usb_serial structure. -+ This fixes the bug that a multiport device could not have more than -+ one port open at one time. -+ -+ (03/17/2000) gkh -+ Added config option for debugging messages. -+ Added patch for keyspan pda from Brian Warner. -+ -+ (03/06/2000) gkh -+ Added the keyspan pda code from Brian Warner <warner@lothar.com> -+ Moved a bunch of the port specific stuff into its own structure. This -+ is in anticipation of the true multiport devices (there's a bug if you -+ try to access more than one port of any multiport device right now) -+ -+ (02/21/2000) gkh -+ Made it so that any serial devices only have to specify which functions -+ they want to overload from the generic function calls (great, -+ inheritance in C, in a driver, just what I wanted...) -+ Added support for set_termios and ioctl function calls. No drivers take -+ advantage of this yet. -+ Removed the #ifdef MODULE, now there is no module specific code. -+ Cleaned up a few comments in usb-serial.h that were wrong (thanks again -+ to Miles Lott). -+ Small fix to get_free_serial. -+ -+ (02/14/2000) gkh -+ Removed the Belkin and Peracom functionality from the driver due to -+ the lack of support from the vendor, and me not wanting people to -+ accidenatly buy the device, expecting it to work with Linux. -+ Added read_bulk_callback and write_bulk_callback to the type structure -+ for the needs of the FTDI and WhiteHEAT driver. -+ Changed all reverences to FTDI to FTDI_SIO at the request of Bill -+ Ryder. -+ Changed the output urb size back to the max endpoint size to make -+ the ftdi_sio driver have it easier, and due to the fact that it didn't -+ really increase the speed any. -+ -+ (02/11/2000) gkh -+ Added VISOR_FUNCTION_CONSOLE to the visor startup function. This was a -+ patch from Miles Lott (milos@insync.net). -+ Fixed bug with not restoring the minor range that a device grabs, if -+ the startup function fails (thanks Miles for finding this). -+ -+ (02/05/2000) gkh -+ Added initial framework for the Keyspan PDA serial converter so that -+ Brian Warner has a place to put his code. -+ Made the ezusb specific functions generic enough that different -+ devices can use them (whiteheat and keyspan_pda both need them). -+ Split out a whole bunch of structure and other stuff to a separate -+ usb-serial.h file. -+ Made the Visor connection messages a little more understandable, now -+ that Miles Lott (milos@insync.net) has gotten the Generic channel to -+ work. Also made them always show up in the log file. -+ -+ (01/25/2000) gkh -+ Added initial framework for FTDI serial converter so that Bill Ryder -+ has a place to put his code. -+ Added the vendor specific info from Handspring. Now we can print out -+ informational debug messages as well as understand what is happening. -+ -+ (01/23/2000) gkh -+ Fixed problem of crash when trying to open a port that didn't have a -+ device assigned to it. Made the minor node finding a little smarter, -+ now it looks to find a continuous space for the new device. -+ -+ (01/21/2000) gkh -+ Fixed bug in visor_startup with patch from Miles Lott (milos@insync.net) -+ Fixed get_serial_by_minor which was all messed up for multi port -+ devices. Fixed multi port problem for generic devices. Now the number -+ of ports is determined by the number of bulk out endpoints for the -+ generic device. -+ -+ (01/19/2000) gkh -+ Removed lots of cruft that was around from the old (pre urb) driver -+ interface. -+ Made the serial_table dynamic. This should save lots of memory when -+ the number of minor nodes goes up to 256. -+ Added initial support for devices that have more than one port. -+ Added more debugging comments for the Visor, and added a needed -+ set_configuration call. -+ -+ (01/17/2000) gkh -+ Fixed the WhiteHEAT firmware (my processing tool had a bug) -+ and added new debug loader firmware for it. -+ Removed the put_char function as it isn't really needed. -+ Added visor startup commands as found by the Win98 dump. -+ -+ (01/13/2000) gkh -+ Fixed the vendor id for the generic driver to the one I meant it to be. -+ -+ (01/12/2000) gkh -+ Forget the version numbering...that's pretty useless... -+ Made the driver able to be compiled so that the user can select which -+ converter they want to use. This allows people who only want the Visor -+ support to not pay the memory size price of the WhiteHEAT. -+ Fixed bug where the generic driver (idVendor=0000 and idProduct=0000) -+ grabbed the root hub. Not good. -+ -+ version 0.4.0 (01/10/2000) gkh -+ Added whiteheat.h containing the firmware for the ConnectTech WhiteHEAT -+ device. Added startup function to allow firmware to be downloaded to -+ a device if it needs to be. -+ Added firmware download logic to the WhiteHEAT device. -+ Started to add #defines to split up the different drivers for potential -+ configuration option. -+ -+ version 0.3.1 (12/30/99) gkh -+ Fixed problems with urb for bulk out. -+ Added initial support for multiple sets of endpoints. This enables -+ the Handspring Visor to be attached successfully. Only the first -+ bulk in / bulk out endpoint pair is being used right now. -+ -+ version 0.3.0 (12/27/99) gkh -+ Added initial support for the Handspring Visor based on a patch from -+ Miles Lott (milos@sneety.insync.net) -+ Cleaned up the code a bunch and converted over to using urbs only. -+ -+ version 0.2.3 (12/21/99) gkh -+ Added initial support for the Connect Tech WhiteHEAT converter. -+ Incremented the number of ports in expectation of getting the -+ WhiteHEAT to work properly (4 ports per connection). -+ Added notification on insertion and removal of what port the -+ device is/was connected to (and what kind of device it was). -+ -+ version 0.2.2 (12/16/99) gkh -+ Changed major number to the new allocated number. We're legal now! -+ -+ version 0.2.1 (12/14/99) gkh -+ Fixed bug that happens when device node is opened when there isn't a -+ device attached to it. Thanks to marek@webdesign.no for noticing this. -+ -+ version 0.2.0 (11/10/99) gkh -+ Split up internals to make it easier to add different types of serial -+ converters to the code. -+ Added a "generic" driver that gets it's vendor and product id -+ from when the module is loaded. Thanks to David E. Nelson (dnelson@jump.net) -+ for the idea and sample code (from the usb scanner driver.) -+ Cleared up any licensing questions by releasing it under the GNU GPL. -+ -+ version 0.1.2 (10/25/99) gkh -+ Fixed bug in detecting device. -+ -+ version 0.1.1 (10/05/99) gkh -+ Changed the major number to not conflict with anything else. -+ -+ version 0.1 (09/28/99) gkh -+ Can recognize the two different devices and start up a read from -+ device when asked to. Writes also work. No control signals yet, this -+ all is vendor specific data (i.e. no spec), also no control for -+ different baud rates or other bit settings. -+ Currently we are using the same devid as the acm driver. This needs -+ to change. -+ -+----------------------------------------------------------------------- -+visor.c Change Log comments: -+ -+ (06/03/2003) Judd Montgomery <judd at jpilot.org> -+ Added support for module parameter options for untested/unknown -+ devices. -+ -+ (03/09/2003) gkh -+ Added support for the Sony Clie NZ90V device. Thanks to Martin Brachtl -+ <brachtl@redgrep.cz> for the information. -+ -+ (03/05/2003) gkh -+ Think Treo support is now working. -+ -+ (04/03/2002) gkh -+ Added support for the Sony OS 4.1 devices. Thanks to Hiroyuki ARAKI -+ <hiro@zob.ne.jp> for the information. -+ -+ (03/27/2002) gkh -+ Removed assumptions that port->tty was always valid (is not true -+ for usb serial console devices.) -+ -+ (03/23/2002) gkh -+ Added support for the Palm i705 device, thanks to Thomas Riemer -+ <tom@netmech.com> for the information. -+ -+ (03/21/2002) gkh -+ Added support for the Palm m130 device, thanks to Udo Eisenbarth -+ <udo.eisenbarth@web.de> for the information. -+ -+ (02/27/2002) gkh -+ Reworked the urb handling logic. We have no more pool, but dynamically -+ allocate the urb and the transfer buffer on the fly. In testing this -+ does not incure any measurable overhead. This also relies on the fact -+ that we have proper reference counting logic for urbs. -+ -+ (02/21/2002) SilaS -+ Added initial support for the Palm m515 devices. -+ -+ (02/14/2002) gkh -+ Added support for the Clie S-360 device. -+ -+ (12/18/2001) gkh -+ Added better Clie support for 3.5 devices. Thanks to Geoffrey Levand -+ for the patch. -+ -+ (11/11/2001) gkh -+ Added support for the m125 devices, and added check to prevent oopses -+ for Cli� devices that lie about the number of ports they have. -+ -+ (08/30/2001) gkh -+ Added support for the Clie devices, both the 3.5 and 4.0 os versions. -+ Many thanks to Daniel Burke, and Bryan Payne for helping with this. -+ -+ (08/23/2001) gkh -+ fixed a few potential bugs pointed out by Oliver Neukum. -+ -+ (05/30/2001) gkh -+ switched from using spinlock to a semaphore, which fixes lots of problems. -+ -+ (05/28/2000) gkh -+ Added initial support for the Palm m500 and Palm m505 devices. -+ -+ (04/08/2001) gb -+ Identify version on module load. -+ -+ (01/21/2000) gkh -+ Added write_room and chars_in_buffer, as they were previously using the -+ generic driver versions which is all wrong now that we are using an urb -+ pool. Thanks to Wolfgang Grandegger for pointing this out to me. -+ Removed count assignment in the write function, which was not needed anymore -+ either. Thanks to Al Borchers for pointing this out. -+ -+ (12/12/2000) gkh -+ Moved MOD_DEC to end of visor_close to be nicer, as the final write -+ message can sleep. -+ -+ (11/12/2000) gkh -+ Fixed bug with data being dropped on the floor by forcing tty->low_latency -+ to be on. Hopefully this fixes the OHCI issue! -+ -+ (11/01/2000) Adam J. Richter -+ usb_device_id table support -+ -+ (10/05/2000) gkh -+ Fixed bug with urb->dev not being set properly, now that the usb -+ core needs it. -+ -+ (09/11/2000) gkh -+ Got rid of always calling kmalloc for every urb we wrote out to the -+ device. -+ Added visor_read_callback so we can keep track of bytes in and out for -+ those people who like to know the speed of their device. -+ Removed DEBUG #ifdefs with call to usb_serial_debug_data -+ -+ (09/06/2000) gkh -+ Fixed oops in visor_exit. Need to uncomment usb_unlink_urb call _after_ -+ the host controller drivers set urb->dev = NULL when the urb is finished. -+ -+ (08/28/2000) gkh -+ Added locks for SMP safeness. -+ -+ (08/08/2000) gkh -+ Fixed endian problem in visor_startup. -+ Fixed MOD_INC and MOD_DEC logic and the ability to open a port more -+ than once. -+ -+ (07/23/2000) gkh -+ Added pool of write urbs to speed up transfers to the visor. -+ -+ (07/19/2000) gkh -+ Added module_init and module_exit functions to handle the fact that this -+ driver is a loadable module now. -+ -+ (07/03/2000) gkh -+ Added visor_set_ioctl and visor_set_termios functions (they don't do much -+ of anything, but are good for debugging.) -+ -+ (06/25/2000) gkh -+ Fixed bug in visor_unthrottle that should help with the disconnect in PPP -+ bug that people have been reporting. -+ -+ (06/23/2000) gkh -+ Cleaned up debugging statements in a quest to find UHCI timeout bug. -+ -+ (04/27/2000) Ryan VanderBijl -+ Fixed memory leak in visor_close -+ -+ (03/26/2000) gkh -+ Split driver up into device specific pieces. -+ -+----------------------------------------------------------------------- -+pl2303.c Change Log comments: -+ -+ 2002_Mar_26 gkh -+ allowed driver to work properly if there is no tty assigned to a port -+ (this happens for serial console devices.) -+ -+ 2001_Oct_06 gkh -+ Added RTS and DTR line control. Thanks to joe@bndlg.de for parts of it. -+ -+ 2001_Sep_19 gkh -+ Added break support. -+ -+ 2001_Aug_30 gkh -+ fixed oops in write_bulk_callback. -+ -+ 2001_Aug_28 gkh -+ reworked buffer logic to be like other usb-serial drivers. Hopefully -+ removing some reported problems. -+ -+ 2001_Jun_06 gkh -+ finished porting to 2.4 format. -+ -+ -+----------------------------------------------------------------------- -+io_edgeport.c Change Log comments: -+ -+ 2003_04_03 al borchers -+ - fixed a bug (that shows up with dosemu) where the tty struct is -+ used in a callback after it has been freed -+ -+ 2.3 2002_03_08 greg kroah-hartman -+ - fixed bug when multiple devices were attached at the same time. -+ -+ 2.2 2001_11_14 greg kroah-hartman -+ - fixed bug in edge_close that kept the port from being used more -+ than once. -+ - fixed memory leak on device removal. -+ - fixed potential double free of memory when command urb submitting -+ failed. -+ - other small cleanups when the device is removed -+ -+ 2.1 2001_07_09 greg kroah-hartman -+ - added support for TIOCMBIS and TIOCMBIC. -+ -+ (04/08/2001) gb -+ - Identify version on module load. -+ -+ 2.0 2001_03_05 greg kroah-hartman -+ - reworked entire driver to fit properly in with the other usb-serial -+ drivers. Occasional oopses still happen, but it's a good start. -+ -+ 1.2.3 (02/23/2001) greg kroah-hartman -+ - changed device table to work properly for 2.4.x final format. -+ - fixed problem with dropping data at high data rates. -+ -+ 1.2.2 (11/27/2000) greg kroah-hartman -+ - cleaned up more NTisms. -+ - Added device table for 2.4.0-test11 -+ -+ 1.2.1 (11/08/2000) greg kroah-hartman -+ - Started to clean up NTisms. -+ - Fixed problem with dev field of urb for kernels >= 2.4.0-test9 -+ -+ 1.2 (10/17/2000) David Iacovelli -+ Remove all EPIC code and GPL source -+ Fix RELEVANT_IFLAG macro to include flow control -+ changes port configuration changes. -+ Fix redefinition of SERIAL_MAGIC -+ Change all timeout values to 5 seconds -+ Tried to fix the UHCI multiple urb submission, but failed miserably. -+ it seems to work fine with OHCI. -+ ( Greg take a look at the #if 0 at end of WriteCmdUsb() we must -+ find a way to work arount this UHCI bug ) -+ -+ 1.1 (10/11/2000) David Iacovelli -+ Fix XON/XOFF flow control to support both IXON and IXOFF -+ -+ 0.9.27 (06/30/2000) David Iacovelli -+ Added transmit queue and now allocate urb for command writes. -+ -+ 0.9.26 (06/29/2000) David Iacovelli -+ Add support for 80251 based edgeport -+ -+ 0.9.25 (06/27/2000) David Iacovelli -+ Do not close the port if it has multiple opens. -+ -+ 0.9.24 (05/26/2000) David Iacovelli -+ Add IOCTLs to support RXTX and JAVA POS -+ and first cut at running BlackBox Demo -+ -+ 0.9.23 (05/24/2000) David Iacovelli -+ Add IOCTLs to support RXTX and JAVA POS -+ -+ 0.9.22 (05/23/2000) David Iacovelli -+ fixed bug in enumeration. If epconfig turns on mapping by -+ path after a device is already plugged in, we now update -+ the mapping correctly -+ -+ 0.9.21 (05/16/2000) David Iacovelli -+ Added BlockUntilChaseResp() to also wait for txcredits -+ Updated the way we allocate and handle write URBs -+ Add debug code to dump buffers -+ -+ 0.9.20 (05/01/2000) David Iacovelli -+ change driver to use usb/tts/ -+ -+ 0.9.19 (05/01/2000) David Iacovelli -+ Update code to compile if DEBUG is off -+ -+ 0.9.18 (04/28/2000) David Iacovelli -+ cleanup and test tty_register with devfs -+ -+ 0.9.17 (04/27/2000) greg kroah-hartman -+ changed tty_register around to be like the way it -+ was before, but now it works properly with devfs. -+ -+ 0.9.16 (04/26/2000) david iacovelli -+ Fixed bug in GetProductInfo() -+ -+ 0.9.15 (04/25/2000) david iacovelli -+ Updated enumeration -+ -+ 0.9.14 (04/24/2000) david iacovelli -+ Removed all config/status IOCTLS and -+ converted to using /proc/edgeport -+ still playing with devfs -+ -+ 0.9.13 (04/24/2000) david iacovelli -+ Removed configuration based on ttyUSB0 -+ Added support for configuration using /prod/edgeport -+ first attempt at using devfs (not working yet!) -+ Added IOCTL to GetProductInfo() -+ Added support for custom baud rates -+ Add support for random port numbers -+ -+ 0.9.12 (04/18/2000) david iacovelli -+ added additional configuration IOCTLs -+ use ttyUSB0 for configuration -+ -+ 0.9.11 (04/17/2000) greg kroah-hartman -+ fixed module initialization race conditions. -+ made all urbs dynamically allocated. -+ made driver devfs compatible. now it only registers the tty device -+ when the device is actually plugged in. -+ -+ 0.9.10 (04/13/2000) greg kroah-hartman -+ added proc interface framework. -+ -+ 0.9.9 (04/13/2000) david iacovelli -+ added enumeration code and ioctls to configure the device -+ -+ 0.9.8 (04/12/2000) david iacovelli -+ Change interrupt read start when device is plugged in -+ and stop when device is removed -+ process interrupt reads when all ports are closed -+ (keep value of rxBytesAvail consistent with the edgeport) -+ set the USB_BULK_QUEUE flag so that we can shove a bunch -+ of urbs at once down the pipe -+ -+ 0.9.7 (04/10/2000) david iacovelli -+ start to add enumeration code. -+ generate serial number for epic devices -+ add support for kdb -+ -+ 0.9.6 (03/30/2000) david iacovelli -+ add IOCTL to get string, manufacture, and boot descriptors -+ -+ 0.9.5 (03/14/2000) greg kroah-hartman -+ more error checking added to SerialOpen to try to fix UHCI open problem -+ -+ 0.9.4 (03/09/2000) greg kroah-hartman -+ added more error checking to handle oops when data is hanging -+ around and tty is abruptly closed. -+ -+ 0.9.3 (03/09/2000) david iacovelli -+ Add epic support for xon/xoff chars -+ play with performance -+ -+ 0.9.2 (03/08/2000) greg kroah-hartman -+ changed most "info" calls to "dbg" -+ implemented flow control properly in the termios call -+ -+ 0.9.1 (03/08/2000) david iacovelli -+ added EPIC support -+ enabled bootloader update -+ -+ 0.9 (03/08/2000) greg kroah-hartman -+ Release to IO networks. -+ Integrated changes that David made -+ made getting urbs for writing SMP safe -+ -+ 0.8 (03/07/2000) greg kroah-hartman -+ Release to IO networks. -+ Fixed problems that were seen in code by David. -+ Now both Edgeport/4 and Edgeport/2 works properly. -+ Changed most of the functions to use port instead of serial. -+ -+ 0.7 (02/27/2000) greg kroah-hartman -+ Milestone 3 release. -+ Release to IO Networks -+ ioctl for waiting on line change implemented. -+ ioctl for getting statistics implemented. -+ multiport support working. -+ lsr and msr registers are now handled properly. -+ change break now hooked up and working. -+ support for all known Edgeport devices. -+ -+ 0.6 (02/22/2000) greg kroah-hartman -+ Release to IO networks. -+ CHASE is implemented correctly when port is closed. -+ SerialOpen now blocks correctly until port is fully opened. -+ -+ 0.5 (02/20/2000) greg kroah-hartman -+ Release to IO networks. -+ Known problems: -+ modem status register changes are not sent on to the user -+ CHASE is not implemented when the port is closed. -+ -+ 0.4 (02/16/2000) greg kroah-hartman -+ Second cut at the CeBit demo. -+ Doesn't leak memory on every write to the port -+ Still small leaks on startup. -+ Added support for Edgeport/2 and Edgeport/8 -+ -+ 0.3 (02/15/2000) greg kroah-hartman -+ CeBit demo release. -+ Force the line settings to 4800, 8, 1, e for the demo. -+ Warning! This version leaks memory like crazy! -+ -+ 0.2 (01/30/2000) greg kroah-hartman -+ Milestone 1 release. -+ Device is found by USB subsystem, enumerated, fimware is downloaded -+ and the descriptors are printed to the debug log, config is set, and -+ green light starts to blink. Open port works, and data can be sent -+ and received at the default settings of the UART. Loopback connector -+ and debug log confirms this. -+ -+ 0.1 (01/23/2000) greg kroah-hartman -+ Initial release to help IO Networks try to set up their test system. -+ Edgeport4 is recognized, firmware is downloaded, config is set so -+ device blinks green light every 3 sec. Port is bound, but opening, -+ closing, and sending data do not work properly. -+ -+ ---- gregkh-2.6.orig/drivers/usb/serial/ChangeLog.old 2005-11-11 22:48:28.000000000 -0800 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,730 +0,0 @@ --This is the contents of some of the drivers/usb/serial/ files that had old --changelog comments. They were quite old, and out of date, and we don't keep --them anymore, so I've put them here, away from the source files, in case --people still care to see them. -- --- Greg Kroah-Hartman <greg@kroah.com> October 20, 2005 -- ------------------------------------------------------------------------- --usb-serial.h Change Log comments: -- -- (03/26/2002) gkh -- removed the port->tty check from port_paranoia_check() due to serial -- consoles not having a tty device assigned to them. -- -- (12/03/2001) gkh -- removed active from the port structure. -- added documentation to the usb_serial_device_type structure -- -- (10/10/2001) gkh -- added vendor and product to serial structure. Needed to determine device -- owner when the device is disconnected. -- -- (05/30/2001) gkh -- added sem to port structure and removed port_lock -- -- (10/05/2000) gkh -- Added interrupt_in_endpointAddress and bulk_in_endpointAddress to help -- fix bug with urb->dev not being set properly, now that the usb core -- needs it. -- -- (09/11/2000) gkh -- Added usb_serial_debug_data function to help get rid of #DEBUG in the -- drivers. -- -- (08/28/2000) gkh -- Added port_lock to port structure. -- -- (08/08/2000) gkh -- Added open_count to port structure. -- -- (07/23/2000) gkh -- Added bulk_out_endpointAddress to port structure. -- -- (07/19/2000) gkh, pberger, and borchers -- Modifications to allow usb-serial drivers to be modules. -- ------------------------------------------------------------------------- --usb-serial.c Change Log comments: -- -- (12/10/2002) gkh -- Split the ports off into their own struct device, and added a -- usb-serial bus driver. -- -- (11/19/2002) gkh -- removed a few #ifdefs for the generic code and cleaned up the failure -- logic in initialization. -- -- (10/02/2002) gkh -- moved the console code to console.c and out of this file. -- -- (06/05/2002) gkh -- moved location of startup() call in serial_probe() until after all -- of the port information and endpoints are initialized. This makes -- things easier for some drivers. -- -- (04/10/2002) gkh -- added serial_read_proc function which creates a -- /proc/tty/driver/usb-serial file. -- -- (03/27/2002) gkh -- Got USB serial console code working properly and merged into the main -- version of the tree. Thanks to Randy Dunlap for the initial version -- of this code, and for pushing me to finish it up. -- The USB serial console works with any usb serial driver device. -- -- (03/21/2002) gkh -- Moved all manipulation of port->open_count into the core. Now the -- individual driver's open and close functions are called only when the -- first open() and last close() is called. Making the drivers a bit -- smaller and simpler. -- Fixed a bug if a driver didn't have the owner field set. -- -- (02/26/2002) gkh -- Moved all locking into the main serial_* functions, instead of having -- the individual drivers have to grab the port semaphore. This should -- reduce races. -- Reworked the MOD_INC logic a bit to always increment and decrement, even -- if the generic driver is being used. -- -- (10/10/2001) gkh -- usb_serial_disconnect() now sets the serial->dev pointer is to NULL to -- help prevent child drivers from accessing the device since it is now -- gone. -- -- (09/13/2001) gkh -- Moved generic driver initialize after we have registered with the USB -- core. Thanks to Randy Dunlap for pointing this problem out. -- -- (07/03/2001) gkh -- Fixed module paramater size. Thanks to John Brockmeyer for the pointer. -- Fixed vendor and product getting defined through the MODULE_PARM macro -- if the Generic driver wasn't compiled in. -- Fixed problem with generic_shutdown() not being called for drivers that -- don't have a shutdown() function. -- -- (06/06/2001) gkh -- added evil hack that is needed for the prolific pl2303 device due to the -- crazy way its endpoints are set up. -- -- (05/30/2001) gkh -- switched from using spinlock to a semaphore, which fixes lots of problems. -- -- (04/08/2001) gb -- Identify version on module load. -- -- 2001_02_05 gkh -- Fixed buffer overflows bug with the generic serial driver. Thanks to -- Todd Squires <squirest@ct0.com> for fixing this. -- -- (01/10/2001) gkh -- Fixed bug where the generic serial adaptor grabbed _any_ device that was -- offered to it. -- -- (12/12/2000) gkh -- Removed MOD_INC and MOD_DEC from poll and disconnect functions, and -- moved them to the serial_open and serial_close functions. -- Also fixed bug with there not being a MOD_DEC for the generic driver -- (thanks to Gary Brubaker for finding this.) -- -- (11/29/2000) gkh -- Small NULL pointer initialization cleanup which saves a bit of disk image -- -- (11/01/2000) Adam J. Richter -- instead of using idVendor/idProduct pairs, usb serial drivers -- now identify their hardware interest with usb_device_id tables, -- which they usually have anyhow for use with MODULE_DEVICE_TABLE. -- -- (10/05/2000) gkh -- Fixed bug with urb->dev not being set properly, now that the usb -- core needs it. -- -- (09/11/2000) gkh -- Removed DEBUG #ifdefs with call to usb_serial_debug_data -- -- (08/28/2000) gkh -- Added port_lock to port structure. -- Added locks for SMP safeness to generic driver -- Fixed the ability to open a generic device's port more than once. -- -- (07/23/2000) gkh -- Added bulk_out_endpointAddress to port structure. -- -- (07/19/2000) gkh, pberger, and borchers -- Modifications to allow usb-serial drivers to be modules. -- -- (07/03/2000) gkh -- Added more debugging to serial_ioctl call -- -- (06/25/2000) gkh -- Changed generic_write_bulk_callback to not call wake_up_interruptible -- directly, but to have port_softint do it at a safer time. -- -- (06/23/2000) gkh -- Cleaned up debugging statements in a quest to find UHCI timeout bug. -- -- (05/22/2000) gkh -- Changed the makefile, enabling the big CONFIG_USB_SERIAL_SOMTHING to be -- removed from the individual device source files. -- -- (05/03/2000) gkh -- Added the Digi Acceleport driver from Al Borchers and Peter Berger. -- -- (05/02/2000) gkh -- Changed devfs and tty register code to work properly now. This was based on -- the ACM driver changes by Vojtech Pavlik. -- -- (04/27/2000) Ryan VanderBijl -- Put calls to *_paranoia_checks into one function. -- -- (04/23/2000) gkh -- Fixed bug that Randy Dunlap found for Generic devices with no bulk out ports. -- Moved when the startup code printed out the devices that are supported. -- -- (04/19/2000) gkh -- Added driver for ZyXEL omni.net lcd plus ISDN TA -- Made startup info message specify which drivers were compiled in. -- -- (04/03/2000) gkh -- Changed the probe process to remove the module unload races. -- Changed where the tty layer gets initialized to have devfs work nicer. -- Added initial devfs support. -- -- (03/26/2000) gkh -- Split driver up into device specific pieces. -- -- (03/19/2000) gkh -- Fixed oops that could happen when device was removed while a program -- was talking to the device. -- Removed the static urbs and now all urbs are created and destroyed -- dynamically. -- Reworked the internal interface. Now everything is based on the -- usb_serial_port structure instead of the larger usb_serial structure. -- This fixes the bug that a multiport device could not have more than -- one port open at one time. -- -- (03/17/2000) gkh -- Added config option for debugging messages. -- Added patch for keyspan pda from Brian Warner. -- -- (03/06/2000) gkh -- Added the keyspan pda code from Brian Warner <warner@lothar.com> -- Moved a bunch of the port specific stuff into its own structure. This -- is in anticipation of the true multiport devices (there's a bug if you -- try to access more than one port of any multiport device right now) -- -- (02/21/2000) gkh -- Made it so that any serial devices only have to specify which functions -- they want to overload from the generic function calls (great, -- inheritance in C, in a driver, just what I wanted...) -- Added support for set_termios and ioctl function calls. No drivers take -- advantage of this yet. -- Removed the #ifdef MODULE, now there is no module specific code. -- Cleaned up a few comments in usb-serial.h that were wrong (thanks again -- to Miles Lott). -- Small fix to get_free_serial. -- -- (02/14/2000) gkh -- Removed the Belkin and Peracom functionality from the driver due to -- the lack of support from the vendor, and me not wanting people to -- accidenatly buy the device, expecting it to work with Linux. -- Added read_bulk_callback and write_bulk_callback to the type structure -- for the needs of the FTDI and WhiteHEAT driver. -- Changed all reverences to FTDI to FTDI_SIO at the request of Bill -- Ryder. -- Changed the output urb size back to the max endpoint size to make -- the ftdi_sio driver have it easier, and due to the fact that it didn't -- really increase the speed any. -- -- (02/11/2000) gkh -- Added VISOR_FUNCTION_CONSOLE to the visor startup function. This was a -- patch from Miles Lott (milos@insync.net). -- Fixed bug with not restoring the minor range that a device grabs, if -- the startup function fails (thanks Miles for finding this). -- -- (02/05/2000) gkh -- Added initial framework for the Keyspan PDA serial converter so that -- Brian Warner has a place to put his code. -- Made the ezusb specific functions generic enough that different -- devices can use them (whiteheat and keyspan_pda both need them). -- Split out a whole bunch of structure and other stuff to a separate -- usb-serial.h file. -- Made the Visor connection messages a little more understandable, now -- that Miles Lott (milos@insync.net) has gotten the Generic channel to -- work. Also made them always show up in the log file. -- -- (01/25/2000) gkh -- Added initial framework for FTDI serial converter so that Bill Ryder -- has a place to put his code. -- Added the vendor specific info from Handspring. Now we can print out -- informational debug messages as well as understand what is happening. -- -- (01/23/2000) gkh -- Fixed problem of crash when trying to open a port that didn't have a -- device assigned to it. Made the minor node finding a little smarter, -- now it looks to find a continuous space for the new device. -- -- (01/21/2000) gkh -- Fixed bug in visor_startup with patch from Miles Lott (milos@insync.net) -- Fixed get_serial_by_minor which was all messed up for multi port -- devices. Fixed multi port problem for generic devices. Now the number -- of ports is determined by the number of bulk out endpoints for the -- generic device. -- -- (01/19/2000) gkh -- Removed lots of cruft that was around from the old (pre urb) driver -- interface. -- Made the serial_table dynamic. This should save lots of memory when -- the number of minor nodes goes up to 256. -- Added initial support for devices that have more than one port. -- Added more debugging comments for the Visor, and added a needed -- set_configuration call. -- -- (01/17/2000) gkh -- Fixed the WhiteHEAT firmware (my processing tool had a bug) -- and added new debug loader firmware for it. -- Removed the put_char function as it isn't really needed. -- Added visor startup commands as found by the Win98 dump. -- -- (01/13/2000) gkh -- Fixed the vendor id for the generic driver to the one I meant it to be. -- -- (01/12/2000) gkh -- Forget the version numbering...that's pretty useless... -- Made the driver able to be compiled so that the user can select which -- converter they want to use. This allows people who only want the Visor -- support to not pay the memory size price of the WhiteHEAT. -- Fixed bug where the generic driver (idVendor=0000 and idProduct=0000) -- grabbed the root hub. Not good. -- -- version 0.4.0 (01/10/2000) gkh -- Added whiteheat.h containing the firmware for the ConnectTech WhiteHEAT -- device. Added startup function to allow firmware to be downloaded to -- a device if it needs to be. -- Added firmware download logic to the WhiteHEAT device. -- Started to add #defines to split up the different drivers for potential -- configuration option. -- -- version 0.3.1 (12/30/99) gkh -- Fixed problems with urb for bulk out. -- Added initial support for multiple sets of endpoints. This enables -- the Handspring Visor to be attached successfully. Only the first -- bulk in / bulk out endpoint pair is being used right now. -- -- version 0.3.0 (12/27/99) gkh -- Added initial support for the Handspring Visor based on a patch from -- Miles Lott (milos@sneety.insync.net) -- Cleaned up the code a bunch and converted over to using urbs only. -- -- version 0.2.3 (12/21/99) gkh -- Added initial support for the Connect Tech WhiteHEAT converter. -- Incremented the number of ports in expectation of getting the -- WhiteHEAT to work properly (4 ports per connection). -- Added notification on insertion and removal of what port the -- device is/was connected to (and what kind of device it was). -- -- version 0.2.2 (12/16/99) gkh -- Changed major number to the new allocated number. We're legal now! -- -- version 0.2.1 (12/14/99) gkh -- Fixed bug that happens when device node is opened when there isn't a -- device attached to it. Thanks to marek@webdesign.no for noticing this. -- -- version 0.2.0 (11/10/99) gkh -- Split up internals to make it easier to add different types of serial -- converters to the code. -- Added a "generic" driver that gets it's vendor and product id -- from when the module is loaded. Thanks to David E. Nelson (dnelson@jump.net) -- for the idea and sample code (from the usb scanner driver.) -- Cleared up any licensing questions by releasing it under the GNU GPL. -- -- version 0.1.2 (10/25/99) gkh -- Fixed bug in detecting device. -- -- version 0.1.1 (10/05/99) gkh -- Changed the major number to not conflict with anything else. -- -- version 0.1 (09/28/99) gkh -- Can recognize the two different devices and start up a read from -- device when asked to. Writes also work. No control signals yet, this -- all is vendor specific data (i.e. no spec), also no control for -- different baud rates or other bit settings. -- Currently we are using the same devid as the acm driver. This needs -- to change. -- ------------------------------------------------------------------------- --visor.c Change Log comments: -- -- (06/03/2003) Judd Montgomery <judd at jpilot.org> -- Added support for module parameter options for untested/unknown -- devices. -- -- (03/09/2003) gkh -- Added support for the Sony Clie NZ90V device. Thanks to Martin Brachtl -- <brachtl@redgrep.cz> for the information. -- -- (03/05/2003) gkh -- Think Treo support is now working. -- -- (04/03/2002) gkh -- Added support for the Sony OS 4.1 devices. Thanks to Hiroyuki ARAKI -- <hiro@zob.ne.jp> for the information. -- -- (03/27/2002) gkh -- Removed assumptions that port->tty was always valid (is not true -- for usb serial console devices.) -- -- (03/23/2002) gkh -- Added support for the Palm i705 device, thanks to Thomas Riemer -- <tom@netmech.com> for the information. -- -- (03/21/2002) gkh -- Added support for the Palm m130 device, thanks to Udo Eisenbarth -- <udo.eisenbarth@web.de> for the information. -- -- (02/27/2002) gkh -- Reworked the urb handling logic. We have no more pool, but dynamically -- allocate the urb and the transfer buffer on the fly. In testing this -- does not incure any measurable overhead. This also relies on the fact -- that we have proper reference counting logic for urbs. -- -- (02/21/2002) SilaS -- Added initial support for the Palm m515 devices. -- -- (02/14/2002) gkh -- Added support for the Clie S-360 device. -- -- (12/18/2001) gkh -- Added better Clie support for 3.5 devices. Thanks to Geoffrey Levand -- for the patch. -- -- (11/11/2001) gkh -- Added support for the m125 devices, and added check to prevent oopses -- for Clié devices that lie about the number of ports they have. -- -- (08/30/2001) gkh -- Added support for the Clie devices, both the 3.5 and 4.0 os versions. -- Many thanks to Daniel Burke, and Bryan Payne for helping with this. -- -- (08/23/2001) gkh -- fixed a few potential bugs pointed out by Oliver Neukum. -- -- (05/30/2001) gkh -- switched from using spinlock to a semaphore, which fixes lots of problems. -- -- (05/28/2000) gkh -- Added initial support for the Palm m500 and Palm m505 devices. -- -- (04/08/2001) gb -- Identify version on module load. -- -- (01/21/2000) gkh -- Added write_room and chars_in_buffer, as they were previously using the -- generic driver versions which is all wrong now that we are using an urb -- pool. Thanks to Wolfgang Grandegger for pointing this out to me. -- Removed count assignment in the write function, which was not needed anymore -- either. Thanks to Al Borchers for pointing this out. -- -- (12/12/2000) gkh -- Moved MOD_DEC to end of visor_close to be nicer, as the final write -- message can sleep. -- -- (11/12/2000) gkh -- Fixed bug with data being dropped on the floor by forcing tty->low_latency -- to be on. Hopefully this fixes the OHCI issue! -- -- (11/01/2000) Adam J. Richter -- usb_device_id table support -- -- (10/05/2000) gkh -- Fixed bug with urb->dev not being set properly, now that the usb -- core needs it. -- -- (09/11/2000) gkh -- Got rid of always calling kmalloc for every urb we wrote out to the -- device. -- Added visor_read_callback so we can keep track of bytes in and out for -- those people who like to know the speed of their device. -- Removed DEBUG #ifdefs with call to usb_serial_debug_data -- -- (09/06/2000) gkh -- Fixed oops in visor_exit. Need to uncomment usb_unlink_urb call _after_ -- the host controller drivers set urb->dev = NULL when the urb is finished. -- -- (08/28/2000) gkh -- Added locks for SMP safeness. -- -- (08/08/2000) gkh -- Fixed endian problem in visor_startup. -- Fixed MOD_INC and MOD_DEC logic and the ability to open a port more -- than once. -- -- (07/23/2000) gkh -- Added pool of write urbs to speed up transfers to the visor. -- -- (07/19/2000) gkh -- Added module_init and module_exit functions to handle the fact that this -- driver is a loadable module now. -- -- (07/03/2000) gkh -- Added visor_set_ioctl and visor_set_termios functions (they don't do much -- of anything, but are good for debugging.) -- -- (06/25/2000) gkh -- Fixed bug in visor_unthrottle that should help with the disconnect in PPP -- bug that people have been reporting. -- -- (06/23/2000) gkh -- Cleaned up debugging statements in a quest to find UHCI timeout bug. -- -- (04/27/2000) Ryan VanderBijl -- Fixed memory leak in visor_close -- -- (03/26/2000) gkh -- Split driver up into device specific pieces. -- ------------------------------------------------------------------------- --pl2303.c Change Log comments: -- -- 2002_Mar_26 gkh -- allowed driver to work properly if there is no tty assigned to a port -- (this happens for serial console devices.) -- -- 2001_Oct_06 gkh -- Added RTS and DTR line control. Thanks to joe@bndlg.de for parts of it. -- -- 2001_Sep_19 gkh -- Added break support. -- -- 2001_Aug_30 gkh -- fixed oops in write_bulk_callback. -- -- 2001_Aug_28 gkh -- reworked buffer logic to be like other usb-serial drivers. Hopefully -- removing some reported problems. -- -- 2001_Jun_06 gkh -- finished porting to 2.4 format. -- -- ------------------------------------------------------------------------- --io_edgeport.c Change Log comments: -- -- 2003_04_03 al borchers -- - fixed a bug (that shows up with dosemu) where the tty struct is -- used in a callback after it has been freed -- -- 2.3 2002_03_08 greg kroah-hartman -- - fixed bug when multiple devices were attached at the same time. -- -- 2.2 2001_11_14 greg kroah-hartman -- - fixed bug in edge_close that kept the port from being used more -- than once. -- - fixed memory leak on device removal. -- - fixed potential double free of memory when command urb submitting -- failed. -- - other small cleanups when the device is removed -- -- 2.1 2001_07_09 greg kroah-hartman -- - added support for TIOCMBIS and TIOCMBIC. -- -- (04/08/2001) gb -- - Identify version on module load. -- -- 2.0 2001_03_05 greg kroah-hartman -- - reworked entire driver to fit properly in with the other usb-serial -- drivers. Occasional oopses still happen, but it's a good start. -- -- 1.2.3 (02/23/2001) greg kroah-hartman -- - changed device table to work properly for 2.4.x final format. -- - fixed problem with dropping data at high data rates. -- -- 1.2.2 (11/27/2000) greg kroah-hartman -- - cleaned up more NTisms. -- - Added device table for 2.4.0-test11 -- -- 1.2.1 (11/08/2000) greg kroah-hartman -- - Started to clean up NTisms. -- - Fixed problem with dev field of urb for kernels >= 2.4.0-test9 -- -- 1.2 (10/17/2000) David Iacovelli -- Remove all EPIC code and GPL source -- Fix RELEVANT_IFLAG macro to include flow control -- changes port configuration changes. -- Fix redefinition of SERIAL_MAGIC -- Change all timeout values to 5 seconds -- Tried to fix the UHCI multiple urb submission, but failed miserably. -- it seems to work fine with OHCI. -- ( Greg take a look at the #if 0 at end of WriteCmdUsb() we must -- find a way to work arount this UHCI bug ) -- -- 1.1 (10/11/2000) David Iacovelli -- Fix XON/XOFF flow control to support both IXON and IXOFF -- -- 0.9.27 (06/30/2000) David Iacovelli -- Added transmit queue and now allocate urb for command writes. -- -- 0.9.26 (06/29/2000) David Iacovelli -- Add support for 80251 based edgeport -- -- 0.9.25 (06/27/2000) David Iacovelli -- Do not close the port if it has multiple opens. -- -- 0.9.24 (05/26/2000) David Iacovelli -- Add IOCTLs to support RXTX and JAVA POS -- and first cut at running BlackBox Demo -- -- 0.9.23 (05/24/2000) David Iacovelli -- Add IOCTLs to support RXTX and JAVA POS -- -- 0.9.22 (05/23/2000) David Iacovelli -- fixed bug in enumeration. If epconfig turns on mapping by -- path after a device is already plugged in, we now update -- the mapping correctly -- -- 0.9.21 (05/16/2000) David Iacovelli -- Added BlockUntilChaseResp() to also wait for txcredits -- Updated the way we allocate and handle write URBs -- Add debug code to dump buffers -- -- 0.9.20 (05/01/2000) David Iacovelli -- change driver to use usb/tts/ -- -- 0.9.19 (05/01/2000) David Iacovelli -- Update code to compile if DEBUG is off -- -- 0.9.18 (04/28/2000) David Iacovelli -- cleanup and test tty_register with devfs -- -- 0.9.17 (04/27/2000) greg kroah-hartman -- changed tty_register around to be like the way it -- was before, but now it works properly with devfs. -- -- 0.9.16 (04/26/2000) david iacovelli -- Fixed bug in GetProductInfo() -- -- 0.9.15 (04/25/2000) david iacovelli -- Updated enumeration -- -- 0.9.14 (04/24/2000) david iacovelli -- Removed all config/status IOCTLS and -- converted to using /proc/edgeport -- still playing with devfs -- -- 0.9.13 (04/24/2000) david iacovelli -- Removed configuration based on ttyUSB0 -- Added support for configuration using /prod/edgeport -- first attempt at using devfs (not working yet!) -- Added IOCTL to GetProductInfo() -- Added support for custom baud rates -- Add support for random port numbers -- -- 0.9.12 (04/18/2000) david iacovelli -- added additional configuration IOCTLs -- use ttyUSB0 for configuration -- -- 0.9.11 (04/17/2000) greg kroah-hartman -- fixed module initialization race conditions. -- made all urbs dynamically allocated. -- made driver devfs compatible. now it only registers the tty device -- when the device is actually plugged in. -- -- 0.9.10 (04/13/2000) greg kroah-hartman -- added proc interface framework. -- -- 0.9.9 (04/13/2000) david iacovelli -- added enumeration code and ioctls to configure the device -- -- 0.9.8 (04/12/2000) david iacovelli -- Change interrupt read start when device is plugged in -- and stop when device is removed -- process interrupt reads when all ports are closed -- (keep value of rxBytesAvail consistent with the edgeport) -- set the USB_BULK_QUEUE flag so that we can shove a bunch -- of urbs at once down the pipe -- -- 0.9.7 (04/10/2000) david iacovelli -- start to add enumeration code. -- generate serial number for epic devices -- add support for kdb -- -- 0.9.6 (03/30/2000) david iacovelli -- add IOCTL to get string, manufacture, and boot descriptors -- -- 0.9.5 (03/14/2000) greg kroah-hartman -- more error checking added to SerialOpen to try to fix UHCI open problem -- -- 0.9.4 (03/09/2000) greg kroah-hartman -- added more error checking to handle oops when data is hanging -- around and tty is abruptly closed. -- -- 0.9.3 (03/09/2000) david iacovelli -- Add epic support for xon/xoff chars -- play with performance -- -- 0.9.2 (03/08/2000) greg kroah-hartman -- changed most "info" calls to "dbg" -- implemented flow control properly in the termios call -- -- 0.9.1 (03/08/2000) david iacovelli -- added EPIC support -- enabled bootloader update -- -- 0.9 (03/08/2000) greg kroah-hartman -- Release to IO networks. -- Integrated changes that David made -- made getting urbs for writing SMP safe -- -- 0.8 (03/07/2000) greg kroah-hartman -- Release to IO networks. -- Fixed problems that were seen in code by David. -- Now both Edgeport/4 and Edgeport/2 works properly. -- Changed most of the functions to use port instead of serial. -- -- 0.7 (02/27/2000) greg kroah-hartman -- Milestone 3 release. -- Release to IO Networks -- ioctl for waiting on line change implemented. -- ioctl for getting statistics implemented. -- multiport support working. -- lsr and msr registers are now handled properly. -- change break now hooked up and working. -- support for all known Edgeport devices. -- -- 0.6 (02/22/2000) greg kroah-hartman -- Release to IO networks. -- CHASE is implemented correctly when port is closed. -- SerialOpen now blocks correctly until port is fully opened. -- -- 0.5 (02/20/2000) greg kroah-hartman -- Release to IO networks. -- Known problems: -- modem status register changes are not sent on to the user -- CHASE is not implemented when the port is closed. -- -- 0.4 (02/16/2000) greg kroah-hartman -- Second cut at the CeBit demo. -- Doesn't leak memory on every write to the port -- Still small leaks on startup. -- Added support for Edgeport/2 and Edgeport/8 -- -- 0.3 (02/15/2000) greg kroah-hartman -- CeBit demo release. -- Force the line settings to 4800, 8, 1, e for the demo. -- Warning! This version leaks memory like crazy! -- -- 0.2 (01/30/2000) greg kroah-hartman -- Milestone 1 release. -- Device is found by USB subsystem, enumerated, fimware is downloaded -- and the descriptors are printed to the debug log, config is set, and -- green light starts to blink. Open port works, and data can be sent -- and received at the default settings of the UART. Loopback connector -- and debug log confirms this. -- -- 0.1 (01/23/2000) greg kroah-hartman -- Initial release to help IO Networks try to set up their test system. -- Edgeport4 is recognized, firmware is downloaded, config is set so -- device blinks green light every 3 sec. Port is bound, but opening, -- closing, and sending data do not work properly. -- -- diff --git a/usb/usb-storage-blacklist-entry-removal.patch b/usb/usb-storage-blacklist-entry-removal.patch deleted file mode 100644 index a334438eae47ac..00000000000000 --- a/usb/usb-storage-blacklist-entry-removal.patch +++ /dev/null @@ -1,32 +0,0 @@ -From pavel@ucw.cz Mon Oct 31 15:31:29 2005 -Date: Mon, 31 Oct 2005 23:56:26 +0100 -From: Pavel Machek <pavel@ucw.cz> -To: Andrew Morton <akpm@osdl.org>, Greg KH <greg@kroah.com> -Subject: USB: kill unneccessary usb-storage blacklist entries -Message-ID: <20051031225626.GA4249@elf.ucw.cz> -Content-Disposition: inline - - -I actually have this device, and kernel reports blacklist entry is no -longer neccessary. - -Signed-off-by: Pavel Machek <pavel@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - drivers/usb/storage/unusual_devs.h | 5 ----- - 1 file changed, 5 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h 2005-11-02 11:37:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/storage/unusual_devs.h 2005-11-02 12:02:58.000000000 -0800 -@@ -710,11 +710,6 @@ - "DIMAGE E223", - US_SC_SCSI, US_PR_DEVICE, NULL, 0 ), - --UNUSUAL_DEV( 0x0693, 0x0002, 0x0100, 0x0100, -- "Hagiwara", -- "FlashGate SmartMedia", -- US_SC_SCSI, US_PR_BULK, NULL, 0 ), -- - UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100, - "Hagiwara", - "Flashgate", diff --git a/usb/usb-storage-fix-detection-of-kodak-flash-readers-in-shuttle_usbat-driver.patch b/usb/usb-storage-fix-detection-of-kodak-flash-readers-in-shuttle_usbat-driver.patch deleted file mode 100644 index 2f04b852643293..00000000000000 --- a/usb/usb-storage-fix-detection-of-kodak-flash-readers-in-shuttle_usbat-driver.patch +++ /dev/null @@ -1,33 +0,0 @@ -From dsd@gentoo.org Sat Nov 12 09:54:01 2005 -Message-ID: <43762BCA.7070909@gentoo.org> -Date: Sat, 12 Nov 2005 17:52:10 +0000 -From: Daniel Drake <dsd@gentoo.org> -To: Greg KH <greg@kroah.com> -CC: USB Storage list <usb-storage@lists.one-eyed-alien.net>, Matthew Dharm <mdharm-usb@one-eyed-alien.net>, <pfavr@how.dk> -Subject: [PATCH] usb-storage: Fix detection of kodak flash readers in shuttle_usbat driver - -Peter Favrholdt reported that his Kodak flash device was getting -detected as a CDROM, and he helped me track this down to the fact that -the device takes a long time (approx 440ms!) to reset. - -This patch increases the delay to 500ms, which solves the problem. - -Signed-off-by: Daniel Drake <dsd@gentoo.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/storage/shuttle_usbat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/usb/storage/shuttle_usbat.c -+++ gregkh-2.6/drivers/usb/storage/shuttle_usbat.c -@@ -853,7 +853,7 @@ static int usbat_identify_device(struct - rc = usbat_device_reset(us); - if (rc != USB_STOR_TRANSPORT_GOOD) - return rc; -- msleep(25); -+ msleep(500); - - /* - * In attempt to distinguish between HP CDRW's and Flash readers, we now diff --git a/usb/usb-usbdevfs_ioctl-from-32bit-fix.patch b/usb/usb-usbdevfs_ioctl-from-32bit-fix.patch deleted file mode 100644 index a0a90531a7ea4c..00000000000000 --- a/usb/usb-usbdevfs_ioctl-from-32bit-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From akpm@osdl.org Sat Oct 29 00:07:43 2005 -Message-Id: <200510290706.j9T76vbf009061@shell0.pdx.osdl.net> -Subject: USB: usbdevfs_ioctl 32bit fix -To: greg@kroah.com -Cc: akpm@osdl.org, zaitcev@redhat.com -From: akpm@osdl.org -Date: Sat, 29 Oct 2005 00:06:26 -0700 - - -From: Andrew Morton <akpm@osdl.org> - -drivers/usb/core/devio.c: In function `proc_ioctl_compat': -drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast - -NFI if this is correct... - -Cc: Pete Zaitcev <zaitcev@redhat.com> -Signed-off-by: Andrew Morton <akpm@osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - - drivers/usb/core/devio.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/core/devio.c 2005-11-02 09:25:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/core/devio.c 2005-11-02 12:02:56.000000000 -0800 -@@ -1392,7 +1392,7 @@ - } - - #ifdef CONFIG_COMPAT --static int proc_ioctl_compat(struct dev_state *ps, void __user *arg) -+static int proc_ioctl_compat(struct dev_state *ps, compat_uptr_t arg) - { - struct usbdevfs_ioctl32 __user *uioc; - struct usbdevfs_ioctl ctrl; -@@ -1511,7 +1511,7 @@ - - case USBDEVFS_IOCTL32: - snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__); -- ret = proc_ioctl_compat(ps, p); -+ ret = proc_ioctl_compat(ps, (compat_uptr_t)(long)p); - break; - #endif - diff --git a/usb/usb-wacom-tablet-driver-update.patch b/usb/usb-wacom-tablet-driver-update.patch deleted file mode 100644 index ee338729b867db..00000000000000 --- a/usb/usb-wacom-tablet-driver-update.patch +++ /dev/null @@ -1,353 +0,0 @@ -From pingc@wacom.com Fri Nov 4 11:01:00 2005 -Message-ID: <320348265B16DA11968C0060CF213AEB1C814F@wacom-nt2.wacom.com> -From: Ping Cheng <pingc@wacom.com> -To: 'Dmitry Torokhov ' <dtor_core@ameritech.net> -Cc: <greg@kroah.com>, <akpm@osdl.org>, <vojtech@suse.cz> -Subject: usb wacom tablet driver update -Date: Fri, 4 Nov 2005 10:52:28 -0800 - - -This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. and -report Device IDs. - -Signed-off-by: Ping Cheng <pingc@wacom.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - - ---- - drivers/usb/input/wacom.c | 133 ++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 110 insertions(+), 23 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/input/wacom.c -+++ gregkh-2.6/drivers/usb/input/wacom.c -@@ -52,8 +52,10 @@ - * v1.30.1 (pi) - Added Graphire3 support - * v1.40 (pc) - Add support for several new devices, fix eraser reporting, ... - * v1.43 (pc) - Added support for Cintiq 21UX -- - Fixed a Graphire bug -- - Merged wacom_intuos3_irq into wacom_intuos_irq -+ * - Fixed a Graphire bug -+ * - Merged wacom_intuos3_irq into wacom_intuos_irq -+ * v1.44 (pc) - Added support for Graphire4, Cintiq 710, Intuos3 6x11, etc. -+ * - Report Device IDs - */ - - /* -@@ -76,7 +78,7 @@ - /* - * Version Information - */ --#define DRIVER_VERSION "v1.43" -+#define DRIVER_VERSION "v1.44" - #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>" - #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" - #define DRIVER_LICENSE "GPL" -@@ -86,10 +88,14 @@ MODULE_DESCRIPTION(DRIVER_DESC); - MODULE_LICENSE(DRIVER_LICENSE); - - #define USB_VENDOR_ID_WACOM 0x056a -+#define STYLUS_DEVICE_ID 0x02 -+#define CURSOR_DEVICE_ID 0x06 -+#define ERASER_DEVICE_ID 0x0A - - enum { - PENPARTNER = 0, - GRAPHIRE, -+ G4, - PL, - INTUOS, - INTUOS3, -@@ -116,6 +122,7 @@ struct wacom { - struct urb *irq; - struct wacom_features *features; - int tool[2]; -+ int id[2]; - __u32 serial[2]; - char phys[32]; - }; -@@ -136,7 +143,7 @@ static void wacom_pl_irq(struct urb *urb - struct wacom *wacom = urb->context; - unsigned char *data = wacom->data; - struct input_dev *dev = wacom->dev; -- int prox, pressure; -+ int prox, pressure, id; - int retval; - - switch (urb->status) { -@@ -163,6 +170,7 @@ static void wacom_pl_irq(struct urb *urb - - input_regs(dev, regs); - -+ id = ERASER_DEVICE_ID; - if (prox) { - - pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1)); -@@ -177,11 +185,15 @@ static void wacom_pl_irq(struct urb *urb - * an out of proximity for previous tool then a in for new tool. - */ - if (!wacom->tool[0]) { -- /* Going into proximity select tool */ -- wacom->tool[1] = (data[4] & 0x20)? BTN_TOOL_RUBBER : BTN_TOOL_PEN; -+ /* Eraser bit set for DTF */ -+ if (data[1] & 0x10) -+ wacom->tool[1] = BTN_TOOL_RUBBER; -+ else -+ /* Going into proximity select tool */ -+ wacom->tool[1] = (data[4] & 0x20) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN; - } else { - /* was entered with stylus2 pressed */ -- if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[4] & 0x20) ) { -+ if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[4] & 0x20)) { - /* report out proximity for previous tool */ - input_report_key(dev, wacom->tool[1], 0); - input_sync(dev); -@@ -192,8 +204,9 @@ static void wacom_pl_irq(struct urb *urb - if (wacom->tool[1] != BTN_TOOL_RUBBER) { - /* Unknown tool selected default to pen tool */ - wacom->tool[1] = BTN_TOOL_PEN; -+ id = STYLUS_DEVICE_ID; - } -- input_report_key(dev, wacom->tool[1], prox); /* report in proximity for tool */ -+ input_report_key(dev, wacom->tool[1], id); /* report in proximity for tool */ - input_report_abs(dev, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14)); - input_report_abs(dev, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14)); - input_report_abs(dev, ABS_PRESSURE, pressure); -@@ -250,10 +263,10 @@ static void wacom_ptu_irq(struct urb *ur - - input_regs(dev, regs); - if (data[1] & 0x04) { -- input_report_key(dev, BTN_TOOL_RUBBER, data[1] & 0x20); -+ input_report_key(dev, BTN_TOOL_RUBBER, (data[1] & 0x20) ? ERASER_DEVICE_ID : 0); - input_report_key(dev, BTN_TOUCH, data[1] & 0x08); - } else { -- input_report_key(dev, BTN_TOOL_PEN, data[1] & 0x20); -+ input_report_key(dev, BTN_TOOL_PEN, (data[1] & 0x20) ? STYLUS_DEVICE_ID : 0); - input_report_key(dev, BTN_TOUCH, data[1] & 0x01); - } - input_report_abs(dev, ABS_X, le16_to_cpu(*(__le16 *) &data[2])); -@@ -299,7 +312,7 @@ static void wacom_penpartner_irq(struct - } - - input_regs(dev, regs); -- input_report_key(dev, BTN_TOOL_PEN, 1); -+ input_report_key(dev, BTN_TOOL_PEN, STYLUS_DEVICE_ID); - input_report_abs(dev, ABS_X, le16_to_cpu(*(__le16 *) &data[1])); - input_report_abs(dev, ABS_Y, le16_to_cpu(*(__le16 *) &data[3])); - input_report_abs(dev, ABS_PRESSURE, (signed char)data[6] + 127); -@@ -319,7 +332,7 @@ static void wacom_graphire_irq(struct ur - struct wacom *wacom = urb->context; - unsigned char *data = wacom->data; - struct input_dev *dev = wacom->dev; -- int x, y; -+ int x, y, id, rw; - int retval; - - switch (urb->status) { -@@ -344,6 +357,7 @@ static void wacom_graphire_irq(struct ur - - input_regs(dev, regs); - -+ id = STYLUS_DEVICE_ID; - if (data[1] & 0x10) { /* in prox */ - - switch ((data[1] >> 5) & 3) { -@@ -354,18 +368,27 @@ static void wacom_graphire_irq(struct ur - - case 1: /* Rubber */ - wacom->tool[0] = BTN_TOOL_RUBBER; -+ id = ERASER_DEVICE_ID; - break; - - case 2: /* Mouse with wheel */ - input_report_key(dev, BTN_MIDDLE, data[1] & 0x04); -- input_report_rel(dev, REL_WHEEL, (signed char) data[6]); -+ if (wacom->features->type == G4) { -+ rw = data[7] & 0x04 ? -(data[7] & 0x03) : (data[7] & 0x03); -+ input_report_rel(dev, REL_WHEEL, rw); -+ } else -+ input_report_rel(dev, REL_WHEEL, (signed char) data[6]); - /* fall through */ - - case 3: /* Mouse without wheel */ - wacom->tool[0] = BTN_TOOL_MOUSE; -+ id = CURSOR_DEVICE_ID; - input_report_key(dev, BTN_LEFT, data[1] & 0x01); - input_report_key(dev, BTN_RIGHT, data[1] & 0x02); -- input_report_abs(dev, ABS_DISTANCE, data[7]); -+ if (wacom->features->type == G4) -+ input_report_abs(dev, ABS_DISTANCE, data[6]); -+ else -+ input_report_abs(dev, ABS_DISTANCE, data[7]); - break; - } - } -@@ -376,16 +399,50 @@ static void wacom_graphire_irq(struct ur - input_report_abs(dev, ABS_X, x); - input_report_abs(dev, ABS_Y, y); - if (wacom->tool[0] != BTN_TOOL_MOUSE) { -- input_report_abs(dev, ABS_PRESSURE, le16_to_cpu(*(__le16 *) &data[6])); -+ input_report_abs(dev, ABS_PRESSURE, data[6] | ((data[7] & 0x01) << 8)); - input_report_key(dev, BTN_TOUCH, data[1] & 0x01); - input_report_key(dev, BTN_STYLUS, data[1] & 0x02); - input_report_key(dev, BTN_STYLUS2, data[1] & 0x04); - } - } - -- input_report_key(dev, wacom->tool[0], data[1] & 0x10); -+ input_report_key(dev, wacom->tool[0], (data[1] & 0x10) ? id : 0); - input_sync(dev); - -+ /* send pad data */ -+ if (wacom->features->type == G4) { -+ /* fist time sending pad data */ -+ if (wacom->tool[1] != BTN_TOOL_FINGER) { -+ wacom->id[1] = 0; -+ wacom->serial[1] = (data[7] & 0x38) >> 2; -+ } -+ if (data[7] & 0xf8) { -+ input_report_key(dev, BTN_0, (data[7] & 0x40)); -+ input_report_key(dev, BTN_4, (data[7] & 0x80)); -+ if (((data[7] & 0x38) >> 2) == (wacom->serial[1] & 0x0e)) -+ /* alter REL_WHEEL value so X apps can get it */ -+ wacom->serial[1] += (wacom->serial[1] & 0x01) ? -1 : 1; -+ else -+ wacom->serial[1] = (data[7] & 0x38 ) >> 2; -+ -+ /* don't alter the value when there is no wheel event */ -+ if (wacom->serial[1] == 1) -+ wacom->serial[1] = 0; -+ rw = wacom->serial[1]; -+ rw = (rw & 0x08) ? -(rw & 0x07) : (rw & 0x07); -+ input_report_rel(dev, REL_WHEEL, rw); -+ wacom->tool[1] = BTN_TOOL_FINGER; -+ wacom->id[1] = data[7] & 0xf8; -+ input_report_key(dev, wacom->tool[1], 0xf0); -+ input_event(dev, EV_MSC, MSC_SERIAL, 0xf0); -+ } else if (wacom->id[1]) { -+ wacom->id[1] = 0; -+ wacom->serial[1] = 0; -+ input_report_key(dev, wacom->tool[1], 0); -+ input_event(dev, EV_MSC, MSC_SERIAL, 0xf0); -+ } -+ input_sync(dev); -+ } - exit: - retval = usb_submit_urb (urb, GFP_ATOMIC); - if (retval) -@@ -410,7 +467,8 @@ static int wacom_intuos_inout(struct urb - (data[4] << 20) + (data[5] << 12) + - (data[6] << 4) + (data[7] >> 4); - -- switch ((data[2] << 4) | (data[3] >> 4)) { -+ wacom->id[idx] = (data[2] << 4) | (data[3] >> 4); -+ switch (wacom->id[idx]) { - case 0x812: /* Inking pen */ - case 0x801: /* Intuos3 Inking pen */ - case 0x012: -@@ -458,7 +516,7 @@ static int wacom_intuos_inout(struct urb - default: /* Unknown tool */ - wacom->tool[idx] = BTN_TOOL_PEN; - } -- input_report_key(dev, wacom->tool[idx], 1); -+ input_report_key(dev, wacom->tool[idx], wacom->id[idx]); - input_event(dev, EV_MSC, MSC_SERIAL, wacom->serial[idx]); - input_sync(dev); - return 1; -@@ -637,7 +695,7 @@ static void wacom_intuos_irq(struct urb - } - } - -- input_report_key(dev, wacom->tool[idx], 1); -+ input_report_key(dev, wacom->tool[idx], wacom->id[idx]); - input_event(dev, EV_MSC, MSC_SERIAL, wacom->serial[idx]); - input_sync(dev); - -@@ -655,6 +713,13 @@ static struct wacom_features wacom_featu - { "Wacom Graphire2 5x7", 8, 13918, 10206, 511, 32, GRAPHIRE, wacom_graphire_irq }, - { "Wacom Graphire3", 8, 10208, 7424, 511, 32, GRAPHIRE, wacom_graphire_irq }, - { "Wacom Graphire3 6x8", 8, 16704, 12064, 511, 32, GRAPHIRE, wacom_graphire_irq }, -+ { "Wacom Graphire4 4x5", 8, 10208, 7424, 511, 32, G4, wacom_graphire_irq }, -+ { "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 32, G4, wacom_graphire_irq }, -+ { "Wacom Volito", 8, 5104, 3712, 511, 32, GRAPHIRE, wacom_graphire_irq }, -+ { "Wacom PenStation2", 8, 3250, 2320, 255, 32, GRAPHIRE, wacom_graphire_irq }, -+ { "Wacom Volito2 4x5", 8, 5104, 3712, 511, 32, GRAPHIRE, wacom_graphire_irq }, -+ { "Wacom Volito2 2x3", 8, 3248, 2320, 511, 32, GRAPHIRE, wacom_graphire_irq }, -+ { "Wacom PenPartner2", 8, 3250, 2320, 255, 32, GRAPHIRE, wacom_graphire_irq }, - { "Wacom Intuos 4x5", 10, 12700, 10600, 1023, 15, INTUOS, wacom_intuos_irq }, - { "Wacom Intuos 6x8", 10, 20320, 16240, 1023, 15, INTUOS, wacom_intuos_irq }, - { "Wacom Intuos 9x12", 10, 30480, 24060, 1023, 15, INTUOS, wacom_intuos_irq }, -@@ -666,16 +731,20 @@ static struct wacom_features wacom_featu - { "Wacom PL600SX", 8, 6260, 5016, 255, 32, PL, wacom_pl_irq }, - { "Wacom PL550", 8, 6144, 4608, 511, 32, PL, wacom_pl_irq }, - { "Wacom PL800", 8, 7220, 5780, 511, 32, PL, wacom_pl_irq }, -+ { "Wacom PL700", 8, 6758, 5406, 511, 32, PL, wacom_pl_irq }, -+ { "Wacom PL510", 8, 6282, 4762, 511, 32, PL, wacom_pl_irq }, -+ { "Wacom PL710", 8, 34080, 27660, 511, 32, PL, wacom_pl_irq }, -+ { "Wacom DTF720", 8, 6858, 5506, 511, 32, PL, wacom_pl_irq }, -+ { "Wacom Cintiq Partner",8, 20480, 15360, 511, 32, PL, wacom_ptu_irq }, - { "Wacom Intuos2 4x5", 10, 12700, 10600, 1023, 15, INTUOS, wacom_intuos_irq }, - { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 15, INTUOS, wacom_intuos_irq }, - { "Wacom Intuos2 9x12", 10, 30480, 24060, 1023, 15, INTUOS, wacom_intuos_irq }, - { "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 15, INTUOS, wacom_intuos_irq }, - { "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 15, INTUOS, wacom_intuos_irq }, -- { "Wacom Volito", 8, 5104, 3712, 511, 32, GRAPHIRE, wacom_graphire_irq }, -- { "Wacom Cintiq Partner",8, 20480, 15360, 511, 32, PL, wacom_ptu_irq }, - { "Wacom Intuos3 4x5", 10, 25400, 20320, 1023, 15, INTUOS3, wacom_intuos_irq }, - { "Wacom Intuos3 6x8", 10, 40640, 30480, 1023, 15, INTUOS3, wacom_intuos_irq }, - { "Wacom Intuos3 9x12", 10, 60960, 45720, 1023, 15, INTUOS3, wacom_intuos_irq }, -+ { "Wacom Intuos3 6x11", 10, 54204, 31750, 1023, 15, INTUOS3, wacom_intuos_irq }, - { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 15, CINTIQ, wacom_intuos_irq }, - { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 15, INTUOS, wacom_intuos_irq }, - { } -@@ -688,6 +757,13 @@ static struct usb_device_id wacom_ids[] - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x13) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x14) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x15) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x63) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x64) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) }, -@@ -699,16 +775,20 @@ static struct usb_device_id wacom_ids[] - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x33) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x34) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x35) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x37) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x38) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x39) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x41) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x42) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x43) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x44) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x45) }, -- { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) }, -- { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB0) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB1) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB2) }, -+ { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, - { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, - { } -@@ -779,6 +859,13 @@ static int wacom_probe(struct usb_interf - input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0); - - switch (wacom->features->type) { -+ case G4: -+ input_dev->evbit[0] |= BIT(EV_MSC); -+ input_dev->mscbit[0] |= BIT(MSC_SERIAL); -+ input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER); -+ input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3) | BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7); -+ /* fall through */ -+ - case GRAPHIRE: - input_dev->evbit[0] |= BIT(EV_REL); - input_dev->relbit[0] |= BIT(REL_WHEEL); diff --git a/usb/usbfs_dir_inode_operations-cleanup.patch b/usb/usbfs_dir_inode_operations-cleanup.patch deleted file mode 100644 index 15f09284117ecf..00000000000000 --- a/usb/usbfs_dir_inode_operations-cleanup.patch +++ /dev/null @@ -1,46 +0,0 @@ -From hirofumi@mail.parknet.co.jp Sat Oct 29 01:20:00 2005 -From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> -To: Greg KH <greg@kroah.com> -Subject: usbfs: usbfs_dir_inode_operations cleanup -Date: Sat, 29 Oct 2005 17:15:12 +0900 -Message-ID: <87d5loeo33.fsf@devron.myhome.or.jp> - -This patch is just cleanup. - -Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - - drivers/usb/core/inode.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - ---- gregkh-2.6.orig/drivers/usb/core/inode.c 2005-11-02 09:25:03.000000000 -0800 -+++ gregkh-2.6/drivers/usb/core/inode.c 2005-11-02 12:02:53.000000000 -0800 -@@ -46,7 +46,6 @@ - - static struct super_operations usbfs_ops; - static struct file_operations default_file_operations; --static struct inode_operations usbfs_dir_inode_operations; - static struct vfsmount *usbfs_mount; - static int usbfs_mount_count; /* = 0 */ - static int ignore_mount = 0; -@@ -262,7 +261,7 @@ - inode->i_fop = &default_file_operations; - break; - case S_IFDIR: -- inode->i_op = &usbfs_dir_inode_operations; -+ inode->i_op = &simple_dir_inode_operations; - inode->i_fop = &simple_dir_operations; - - /* directory inodes start off with i_nlink == 2 (for "." entry) */ -@@ -417,10 +416,6 @@ - .llseek = default_file_lseek, - }; - --static struct inode_operations usbfs_dir_inode_operations = { -- .lookup = simple_lookup, --}; -- - static struct super_operations usbfs_ops = { - .statfs = simple_statfs, - .drop_inode = generic_delete_inode, |