ChangeSet 1.1019.1.23, 2003/07/30 13:32:06-07:00, [EMAIL PROTECTED]

[PATCH] USB: support for Zaurus 750/760 to usbnet.c (2.4.22-pre8) + code cleanup 
backport from 2.6

This patch is against 2.4.22-pre8 and unifies the pxa support as suggested by
David Brownell.


 drivers/usb/usbnet.c |   44 +++++++++++++++++---------------------------
 1 files changed, 17 insertions(+), 27 deletions(-)


diff -Nru a/drivers/usb/usbnet.c b/drivers/usb/usbnet.c
--- a/drivers/usb/usbnet.c      Thu Aug 28 14:50:28 2003
+++ b/drivers/usb/usbnet.c      Thu Aug 28 14:50:28 2003
@@ -1391,27 +1391,8 @@
 };
 
 /* PXA-2xx based */
-static const struct driver_info        zaurus_sla300_info = {
-       .description =  "Sharp Zaurus SL-A300",
-       .flags =        FLAG_FRAMING_Z,
-       .check_connect = always_connected,
-       .tx_fixup =     zaurus_tx_fixup,
-
-       .in = 1, .out = 2,
-       .epsize = 64,
-};
-static const struct driver_info        zaurus_slb500_info = {
-       /* Japanese B500 ~= US SL-5600 */
-       .description =  "Sharp Zaurus SL-B500",
-       .flags =        FLAG_FRAMING_Z,
-       .check_connect = always_connected,
-       .tx_fixup =     zaurus_tx_fixup,
-
-       .in = 1, .out = 2,
-       .epsize = 64,
-};
-static const struct driver_info        zaurus_slc700_info = {
-       .description =  "Sharp Zaurus SL-C700",
+static const struct driver_info zaurus_pxa_info = {
+       .description =  "Sharp Zaurus, PXA-2xx based",
        .flags =        FLAG_FRAMING_Z,
        .check_connect = always_connected,
        .tx_fixup =     zaurus_tx_fixup,
@@ -2388,29 +2369,38 @@
        .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
                          | USB_DEVICE_ID_MATCH_DEVICE, 
        .idVendor               = 0x04DD,
-       .idProduct              = 0x8005,
+       .idProduct              = 0x8005, /* A-300 */
        .bInterfaceClass        = 0x02,
        .bInterfaceSubClass     = 0x0a,
        .bInterfaceProtocol     = 0x00,
-       .driver_info =  (unsigned long) &zaurus_sla300_info,
+       .driver_info =  (unsigned long) &zaurus_pxa_info,
 }, {
        .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
                          | USB_DEVICE_ID_MATCH_DEVICE, 
        .idVendor               = 0x04DD,
-       .idProduct              = 0x8006,
+       .idProduct              = 0x8006, /* B-500/SL-5600 */
        .bInterfaceClass        = 0x02,
        .bInterfaceSubClass     = 0x0a,
        .bInterfaceProtocol     = 0x00,
-       .driver_info =  (unsigned long) &zaurus_slb500_info,
+       .driver_info =  (unsigned long) &zaurus_pxa_info,
 }, {
        .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
                          | USB_DEVICE_ID_MATCH_DEVICE, 
        .idVendor               = 0x04DD,
-       .idProduct              = 0x8007,
+       .idProduct              = 0x8007, /* C-700 */
+       .bInterfaceClass        = 0x02,
+       .bInterfaceSubClass     = 0x0a,
+       .bInterfaceProtocol     = 0x00,
+       .driver_info =  (unsigned long) &zaurus_pxa_info,
+}, {
+       .match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO
+                         | USB_DEVICE_ID_MATCH_DEVICE,
+       .idVendor               = 0x04DD,
+       .idProduct              = 0x9031, /* C-750 C-760 */
        .bInterfaceClass        = 0x02,
        .bInterfaceSubClass     = 0x0a,
        .bInterfaceProtocol     = 0x00,
-       .driver_info =  (unsigned long) &zaurus_slc700_info,
+       .driver_info =  (unsigned long) &zaurus_pxa_info,
 },
 #endif
 



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to