diff options
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/visor.c | 11 | ||||
| -rw-r--r-- | drivers/usb/serial/visor.h | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 92be76036702..d6a6d11d1b13 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c @@ -12,6 +12,10 @@ * * See Documentation/usb/usb-serial.txt for more information on using this driver * + * (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.) @@ -186,6 +190,7 @@ static __devinitdata struct usb_device_id combined_id_table [] = { { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) }, { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID) }, { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_S360_ID) }, + { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_1_ID) }, { } /* Terminating entry */ }; @@ -205,6 +210,7 @@ static __devinitdata struct usb_device_id id_table [] = { { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_3_5_ID) }, { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_0_ID) }, { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_S360_ID) }, + { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_4_1_ID) }, { } /* Terminating entry */ }; @@ -215,7 +221,7 @@ MODULE_DEVICE_TABLE (usb, id_table); /* All of the device info needed for the Handspring Visor, and Palm 4.0 devices */ static struct usb_serial_device_type handspring_device = { owner: THIS_MODULE, - name: "Handspring Visor / Palm 4.0 / Clié 4.0", + name: "Handspring Visor / Palm 4.0 / Clié 4.x", id_table: combined_id_table, num_interrupt_in: 0, num_bulk_in: 2, @@ -582,7 +588,8 @@ static int visor_startup (struct usb_serial *serial) } if ((serial->dev->descriptor.idVendor == PALM_VENDOR_ID) || - (serial->dev->descriptor.idVendor == SONY_VENDOR_ID)) { + ((serial->dev->descriptor.idVendor == SONY_VENDOR_ID) && + (serial->dev->descriptor.idProduct != SONY_CLIE_4_1_ID))) { /* Palm OS 4.0 Hack */ response = usb_control_msg (serial->dev, usb_rcvctrlpipe(serial->dev, 0), PALM_GET_SOME_UNKNOWN_INFORMATION, diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h index b4a28ad79a16..6fa7809a6ab2 100644 --- a/drivers/usb/serial/visor.h +++ b/drivers/usb/serial/visor.h @@ -32,6 +32,7 @@ #define SONY_CLIE_3_5_ID 0x0038 #define SONY_CLIE_4_0_ID 0x0066 #define SONY_CLIE_S360_ID 0x0095 +#define SONY_CLIE_4_1_ID 0x009A /**************************************************************************** * Handspring Visor Vendor specific request codes (bRequest values) |