Module Name: src
Committed By: riz
Date: Sat Nov 20 01:14:23 UTC 2010
Modified Files:
src/share/man/man4 [netbsd-5]: udav.4
src/sys/dev/usb [netbsd-5]: if_udav.c usbdevs
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1379):
sys/dev/usb/usbdevs_data.h: revision 1.545
sys/dev/usb/if_udav.c: revision 1.30
sys/dev/usb/usbdevs: revision 1.549
sys/dev/usb/usbdevs.h: revision 1.544
share/man/man4/udav.4: revision 1.4
SUNRISING SR9600 Fast Ethernet
regen for SUNRISING SR9600 Fast Ethernet
match on SUNRISING SR9600 Fast Ethernet
add ShanTou ADM8515 and SUNRISING SR9600 Ethernet to list of supported devices
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.18.1 src/share/man/man4/udav.4
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.519.4.5 -r1.519.4.6 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/share/man/man4/udav.4
diff -u src/share/man/man4/udav.4:1.2 src/share/man/man4/udav.4:1.2.18.1
--- src/share/man/man4/udav.4:1.2 Thu Jul 12 21:26:03 2007
+++ src/share/man/man4/udav.4 Sat Nov 20 01:14:22 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: udav.4,v 1.2 2007/07/12 21:26:03 xtraeme Exp $
+.\" $NetBSD: udav.4,v 1.2.18.1 2010/11/20 01:14:22 riz Exp $
.\"
.\" Copyright (c) 2003
.\" Shingo WATANABE <[email protected]>. All rights reserved.
@@ -30,7 +30,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 12, 2007
+.Dd April 19, 2010
.Dt UDAV 4
.Os
.Sh NAME
@@ -47,6 +47,8 @@
.Bl -tag -width Dv -offset indent -compact
.It Tn Corega FEther USB-TXC
.It Tn ShanTou ST268 USB NIC
+.It Tn ShanTou ADM8515
+.It Tn SUNRISING SR9600 Ethernet
.El
.Sh DESCRIPTION
The
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.24 src/sys/dev/usb/if_udav.c:1.24.8.1
--- src/sys/dev/usb/if_udav.c:1.24 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/if_udav.c Sat Nov 20 01:14:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.24 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: if_udav.c,v 1.24.8.1 2010/11/20 01:14:21 riz Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.24 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.24.8.1 2010/11/20 01:14:21 riz Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -154,6 +154,8 @@
{{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ST268_USB_NIC }, 0},
/* ShanTou ADM8515 */
{{ USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ADM8515 }, 0},
+ /* SUNRISING SR9600 */
+ {{ USB_VENDOR_SUNRISING, USB_PRODUCT_SUNRISING_SR9600 }, 0 },
#if 0
/* DAVICOM DM9601 Generic? */
/* XXX: The following ids was obtained from the data sheet. */
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.519.4.5 src/sys/dev/usb/usbdevs:1.519.4.6
--- src/sys/dev/usb/usbdevs:1.519.4.5 Tue Mar 9 03:45:43 2010
+++ src/sys/dev/usb/usbdevs Sat Nov 20 01:14:22 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp $
+$NetBSD: usbdevs,v 1.519.4.6 2010/11/20 01:14:22 riz Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -414,6 +414,7 @@
vendor FALCOM 0x0f94 Falcom Wireless Communications GmbH
vendor RIM 0x0fca Research In Motion
vendor DYNASTREAM 0x0fcf Dynastream Innovations
+vendor SUNRISING 0x0fe6 SUNRISING
vendor QUALCOMM 0x1004 Qualcomm
vendor GIGABYTE 0x1044 GIGABYTE
vendor MOTOROLA 0x1063 Motorola
@@ -2195,6 +2196,9 @@
/* XXX The above is a North American PC style keyboard possibly */
product SUN MOUSE 0x0100 Type 6 USB mouse
+/* SUNRISING products */
+product SUNRISING SR9600 0x8101 SR9600 Ethernet
+
/* SuperTop products */
product SUPERTOP IDEBRIDGE 0x6600 SuperTop IDE Bridge
