[src/trunk]: src/sys/dev/usb PR/45156: Moritz Wilhelmy: XS Stick P14 amendment

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/37e2d14e2159
branches:  trunk
changeset: 771009:37e2d14e2159
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 06 02:29:33 2011 +0000

description:
PR/45156: Moritz Wilhelmy: XS Stick P14 amendment

diffstat:

 sys/dev/usb/u3g.c   |  6 +++---
 sys/dev/usb/usbdevs |  3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r a126ff7016d9 -r 37e2d14e2159 sys/dev/usb/u3g.c
--- a/sys/dev/usb/u3g.c Sun Nov 06 02:11:16 2011 +0000
+++ b/sys/dev/usb/u3g.c Sun Nov 06 02:29:33 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: u3g.c,v 1.20 2011/09/30 18:59:04 christos Exp $        */
+/*     $NetBSD: u3g.c,v 1.21 2011/11/06 02:29:33 christos Exp $        */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.20 2011/09/30 18:59:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.21 2011/11/06 02:29:33 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -506,7 +506,7 @@
                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;
 
diff -r a126ff7016d9 -r 37e2d14e2159 sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Sun Nov 06 02:11:16 2011 +0000
+++ b/sys/dev/usb/usbdevs       Sun Nov 06 02:29:33 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.599 2011/11/02 04:59:51 macallan Exp $
+$NetBSD: usbdevs,v 1.600 2011/11/06 02:29:33 christos Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -576,6 +576,7 @@
 
 /* 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