Module Name: src
Committed By: martin
Date: Sat Feb 21 19:38:02 UTC 2015
Modified Files:
src/sys/dev/usb [netbsd-7]: uftdi.c usbdevs
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #538):
sys/dev/usb/uftdi.c: revision 1.60
sys/dev/usb/usbdevs: revision 1.690
PR/49681: Support BUFFALO PC-OP-RS1
PR/49681: Support BUFFALO PC-OP-RS1
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.4.1 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.680.2.2 -r1.680.2.3 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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.59 src/sys/dev/usb/uftdi.c:1.59.4.1
--- src/sys/dev/usb/uftdi.c:1.59 Thu Dec 19 08:22:40 2013
+++ src/sys/dev/usb/uftdi.c Sat Feb 21 19:38:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.59 2013/12/19 08:22:40 msaitoh Exp $ */
+/* $NetBSD: uftdi.c,v 1.59.4.1 2015/02/21 19:38:02 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59 2013/12/19 08:22:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.4.1 2015/02/21 19:38:02 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -159,6 +159,7 @@ static const struct usb_devno uftdi_devs
{ USB_VENDOR_xxFTDI, USB_PRODUCT_xxFTDI_SHEEVAPLUG_JTAG },
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN },
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI },
+ { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_PCOPRS1 },
{ USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60F },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_USBSERIAL },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_SEAPORT4P1 },
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.680.2.2 src/sys/dev/usb/usbdevs:1.680.2.3
--- src/sys/dev/usb/usbdevs:1.680.2.2 Fri Jan 16 08:30:42 2015
+++ src/sys/dev/usb/usbdevs Sat Feb 21 19:38:02 2015
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.680.2.2 2015/01/16 08:30:42 martin Exp $
+$NetBSD: usbdevs,v 1.680.2.3 2015/02/21 19:38:02 martin Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -2082,6 +2082,7 @@ product MELCO KG54 0x0066 WLI-U2-KG54 W
product MELCO KG54AI 0x0067 WLI-U2-KG54-AI WLAN
product MELCO LUAU2GT 0x006e LUA-U2-GT Ethernet
product MELCO NINWIFI 0x008b Nintendo Wi-Fi
+product MELCO PCOPRS1 0x00b3 RemoteStation PC-OP-RS1
product MELCO SG54HP 0x00d8 WLI-U2-SG54HP
product MELCO G54HP 0x00d9 WLI-U2-G54HP
product MELCO KG54L 0x00da WLI-U2-KG54L
