Re: kern/45156 (Patch to support XS Stick P14 USB 3G Modem and similar devices)

[Moritz Wilhelmy <moritz%wzff.de@localhost>]

Well, here's another diff. Thanks to Christos for taking care of this.
Not that it's important or anything. I guess most USB UMTS
initialisation strings could be ported from Linux/usb_modeswitch, a tool
with horrible code, but proper reverse engineering.

One remaining issue, I have to pull the stick out and re-insert it. Can
someone clarify whether this happens with other hardware as well? This
wasn't required with usb_modeswitch. Maybe resets the USB device
somehow? (Caveat: I am not very experienced with regards to the USB
Bus.)

Thanks,

        Moritz


Index: dev/usb/u3g.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/u3g.c,v
retrieving revision 1.20
diff -u -p -r1.20 u3g.c
--- dev/usb/u3g.c       30 Sep 2011 18:59:04 -0000      1.20
+++ dev/usb/u3g.c       5 Nov 2011 20:49:41 -0000
@@ -506,7 +506,7 @@ u3ginit_match(device_t parent, cfdata_t 
                break;
 
        case USB_VENDOR_4GSYSTEMS:
-               if (uaa->product == USB_PRODUCT_4GSYSTEMS_XSSTICK_P14)
+               if (uaa->product == USB_PRODUCT_4GSYSTEMS_XSSTICK_P14_INSTALLER)
                        return u3g_4gsystems_reinit(uaa->device);
                break;
 
Index: dev/usb/usbdevs
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs,v
retrieving revision 1.597
diff -u -p -r1.597 usbdevs
--- dev/usb/usbdevs     30 Sep 2011 18:42:59 -0000      1.597
+++ dev/usb/usbdevs     5 Nov 2011 20:49:42 -0000
@@ -576,6 +576,7 @@ product 3COMUSR USR56K              0x3021  U.S.Robot
 
 /* 4G Systems products */
 product 4GSYSTEMS XSSTICK_P14  0x9605  4G Systems XSStick P14
+product 4GSYSTEMS XSSTICK_P14_INSTALLER        0xf000  4G Systems XSStick P14 
- Windows driver
 
 /* ACDC products */
 product ACDC HUB               0x2315  USB Pen Drive HUB
Index: dev/usb/usbdevs.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.590
diff -u -p -r1.590 usbdevs.h
--- dev/usb/usbdevs.h   30 Sep 2011 18:43:19 -0000      1.590
+++ dev/usb/usbdevs.h   5 Nov 2011 20:49:42 -0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdevs.h,v 1.590 2011/09/30 18:43:19 christos Exp $   */
+/*     $NetBSD$        */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -583,6 +583,7 @@
 
 /* 4G Systems products */
 #define        USB_PRODUCT_4GSYSTEMS_XSSTICK_P14       0x9605          /* 4G 
Systems XSStick P14 */
+#define        USB_PRODUCT_4GSYSTEMS_XSSTICK_P14_INSTALLER     0xf000          
/* 4G Systems XSStick P14 - Windows driver */
 
 /* ACDC products */
 #define        USB_PRODUCT_ACDC_HUB    0x2315          /* USB Pen Drive HUB */
Index: dev/usb/usbdevs_data.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.591
diff -u -p -r1.591 usbdevs_data.h
--- dev/usb/usbdevs_data.h      30 Sep 2011 18:43:19 -0000      1.591
+++ dev/usb/usbdevs_data.h      5 Nov 2011 20:49:58 -0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdevs_data.h,v 1.591 2011/09/30 18:43:19 christos Exp $      
*/
+/*     $NetBSD$        */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -2079,6 +2079,10 @@ const struct usb_product usb_products[] 
            "4G Systems XSStick P14",
        },
        {
+           USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_P14_INSTALLER,
+           "4G Systems XSStick P14 - Windows driver",
+       },
+       {
            USB_VENDOR_ACDC, USB_PRODUCT_ACDC_HUB,
            "USB Pen Drive HUB",
        },
@@ -8559,4 +8563,4 @@ const struct usb_product usb_products[] 
            "Prestige",
        },
 };
-const int usb_nproducts = 1632;
+const int usb_nproducts = 1633;