# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.393 -> 1.394
# drivers/usb/serial/visor.h 1.9 -> 1.10
# drivers/usb/serial/visor.c 1.23 -> 1.24
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/04/08 [EMAIL PROTECTED] 1.394
# USB visor driver
#
# Added support for the Sony OS 4.1 devices. Thanks to Hiroyuki ARAKI
# <[EMAIL PROTECTED]> for the information.
# --------------------------------------------
#
diff -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
--- a/drivers/usb/serial/visor.c Mon Apr 8 09:45:32 2002
+++ b/drivers/usb/serial/visor.c Mon Apr 8 09:45:32 2002
@@ -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
+ * <[EMAIL PROTECTED]> for the information.
+ *
* (03/23/2002) gkh
* Added support for the Palm i705 device, thanks to Thomas Riemer
* <[EMAIL PROTECTED]> for the information.
@@ -189,6 +193,7 @@
static __devinitdata struct usb_device_id clie_id_4_0_table [] = {
{ 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 */
};
@@ -203,6 +208,7 @@
{ 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 */
};
@@ -290,7 +296,7 @@
/* device info for the Sony Clie OS version 4.0 */
static struct usb_serial_device_type clie_4_0_device = {
- name: "Sony Cli� 4.0",
+ name: "Sony Cli� 4.x",
id_table: clie_id_4_0_table,
needs_interrupt_in: MUST_HAVE_NOT, /* this device must not have
an interrupt in endpoint */
needs_bulk_in: MUST_HAVE, /* this device must have a
bulk in endpoint */
@@ -698,7 +704,8 @@
}
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 -Nru a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
--- a/drivers/usb/serial/visor.h Mon Apr 8 09:45:32 2002
+++ b/drivers/usb/serial/visor.h Mon Apr 8 09:45:32 2002
@@ -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)
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel