Module Name: src
Committed By: bouyer
Date: Sat Sep 7 16:22:29 UTC 2013
Modified Files:
src/sys/dev/usb [netbsd-6]: u3g.c usbdevs
Log Message:
Pull up following revision(s) (requested by dholland in ticket #937):
sys/dev/usb/u3g.c: revision 1.30
sys/dev/usb/usbdevs: revision 1.653
PR/48172: Reinhard Speyerer: u3g(4): add 4G Systems XS Stick W14 support
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.607.2.8 -r1.607.2.9 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.24.2.1 src/sys/dev/usb/u3g.c:1.24.2.2
--- src/sys/dev/usb/u3g.c:1.24.2.1 Mon Feb 11 21:44:22 2013
+++ src/sys/dev/usb/u3g.c Sat Sep 7 16:22:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.24.2.1 2013/02/11 21:44:22 riz Exp $ */
+/* $NetBSD: u3g.c,v 1.24.2.2 2013/09/07 16:22:29 bouyer Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.24.2.1 2013/02/11 21:44:22 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.24.2.2 2013/09/07 16:22:29 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -251,6 +251,7 @@ static const struct usb_devno u3g_devs[]
/* 4G Systems */
{ USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_P14 },
+ { USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_W14 },
};
static int
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.607.2.8 src/sys/dev/usb/usbdevs:1.607.2.9
--- src/sys/dev/usb/usbdevs:1.607.2.8 Sun May 19 21:51:00 2013
+++ src/sys/dev/usb/usbdevs Sat Sep 7 16:22:29 2013
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.607.2.8 2013/05/19 21:51:00 riz Exp $
+$NetBSD: usbdevs,v 1.607.2.9 2013/09/07 16:22:29 bouyer Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -583,6 +583,7 @@ product 3COMUSR HOMECONN 0x009d 3Com Hom
product 3COMUSR USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro
/* 4G Systems products */
+product 4GSYSTEMS XSSTICK_W14 0x9603 4G Systems XSStick W14
product 4GSYSTEMS XSSTICK_P14 0x9605 4G Systems XSStick P14
product 4GSYSTEMS XSSTICK_P14_INSTALLER 0xf000 4G Systems XSStick P14 - Windows driver
