Module Name: src
Committed By: christos
Date: Sun Nov 6 02:29:33 UTC 2011
Modified Files:
src/sys/dev/usb: u3g.c usbdevs
Log Message:
PR/45156: Moritz Wilhelmy: XS Stick P14 amendment
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.599 -r1.600 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.20 src/sys/dev/usb/u3g.c:1.21
--- src/sys/dev/usb/u3g.c:1.20 Fri Sep 30 14:59:04 2011
+++ src/sys/dev/usb/u3g.c Sat Nov 5 22:29:33 2011
@@ -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 @@ 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: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.599 src/sys/dev/usb/usbdevs:1.600
--- src/sys/dev/usb/usbdevs:1.599 Wed Nov 2 00:59:51 2011
+++ src/sys/dev/usb/usbdevs Sat Nov 5 22:29:33 2011
@@ -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 @@ 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
