Module Name: src
Committed By: skrll
Date: Mon Sep 21 14:35:02 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdevs
Log Message:
Sync with HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.684.2.2 -r1.684.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/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.684.2.2 src/sys/dev/usb/usbdevs:1.684.2.3
--- src/sys/dev/usb/usbdevs:1.684.2.2 Sat Jun 6 14:40:14 2015
+++ src/sys/dev/usb/usbdevs Mon Sep 21 14:35:02 2015
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.684.2.2 2015/06/06 14:40:14 skrll Exp $
+$NetBSD: usbdevs,v 1.684.2.3 2015/09/21 14:35:02 skrll Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -591,7 +591,6 @@ vendor NETGEAR4 0x9846 Netgear
vendor xxFTDI 0x9e88 FTDI
vendor CACE 0xcace CACE Technologies
vendor COMPARE 0xcdab Compare
-vendor EMPIA 0xeb1a eMPIA Technology
vendor DATAAPEX 0xdaae DataApex
vendor EVOLUTION 0xdeee Evolution Robotics
vendor EMPIA 0xeb1a eMPIA Technology
@@ -914,7 +913,9 @@ product ASUSTEK RT3070 0x1784 RT3070
product ASUSTEK USBN10 0x1786 USB-N10
product ASUSTEK RT3070_1 0x1790 RT3070
product ASUSTEK RTL8192SU_1 0x1791 RTL8192SU
+product ASUSTEK USBN53 0x179d USB-N53
product ASUSTEK RTL8192CU 0x17ab RTL8192CU
+product ASUSTEK USBN66 0x17ad USB-N66
product ASUSTEK USBN10NANO 0x17ba USB-N10 Nano
product ASUSTEK RTL8192CU_3 0x17c0 RTL8192CU_3
product ASUSTEK MYPAL_A730 0x4202 MyPal A730
@@ -1215,7 +1216,7 @@ product COREGA RT2870_1 0x002f RT2870
product COREGA RT2870_2 0x003c RT2870
product COREGA RT2870_3 0x003f RT2870
product COREGA RT3070 0x0041 RT3070
-product COREGA RTL8192SU 0x0047 RTL8192SU
+product COREGA CGWLUSBNM 0x0047 CG-WLUSBNM
product COREGA RTL8192CU 0x0056 RTL8192CU
product COREGA CGWLUSB300GNM 0x0042 CG-WLUSB300GNM
product COREGA WLUSB_11_STICK 0x7613 WLAN USB Stick 11
@@ -1353,12 +1354,13 @@ product DLINK DWLAG122 0x3a04 DWL-AG122
product DLINK DWLAG122_NF 0x3a05 DWL-AG122
product DLINK DWLG122 0x3c00 AirPlus G Wireless USB Adapter
/* product DLINK RT2570 0x3c00 RT2570 */
-product DLINK2 DWLG122C1 0x3c03 DWL-G122 rev C1
-product DLINK2 WUA1340 0x3c04 WUA-1340
product DLINK DUBE100B1 0x3c05 DUB-E100 rev B1
-product DLINK2 DWA111 0x3c06 DWA-111
product DLINK RT2870 0x3c09 RT2870
product DLINK RT3072 0x3c0a RT3072
+product DLINK DWA140B3 0x3c15 DWA-140 rev B3
+product DLINK DWA160B2 0x3c1a DWA-160 rev B2
+product DLINK DWA127 0x3c1b DWA-127
+product DLINK DWA162 0x3c1f DWA-162 Wireless Adapter
product DLINK DSB650C 0x4000 10Mbps ethernet adapter
product DLINK DSB650TX1 0x4001 10/100 ethernet adapter
product DLINK DSB650TX 0x4002 10/100 ethernet adapter
@@ -1979,8 +1981,9 @@ product LACIE HD 0xa601 Hard Disk
product LACIE CDRW 0xa602 CD R/W
/* Lenovo products */
-product LENOVO ETHERNET 0x7203 USB 2.0 Ethernet
product LENOVO AX88179 0x304b AX88179 USB 3.0 gigabit ethernet controller
+product LENOVO COMPACTKBDWTP 0x6047 ThinkPad Compact USB keyboard with TrackPoint
+product LENOVO ETHERNET 0x7203 USB 2.0 Ethernet
/* Lexar products */
product LEXAR JUMPSHOT 0x0001 jumpSHOT CompactFlash Reader
@@ -2027,6 +2030,7 @@ product LOGITEC RT2870_2 0x0163 RT2870
product LOGITEC RT2870_3 0x0164 RT2870
product LOGITEC LANW300NU2 0x0166 LAN-W300N/U2
product LOGITEC RT3020 0x0168 RT3020
+product LOGITEC LANW300NU2S 0x0169 LAN-W300N/U2S
product LOGITEC LAN_W450ANU2E 0x016b LAN-W450ANU2E
product LOGITEC LAN_W300ANU2 0x0170 LAN-W300AN/U2
@@ -2476,6 +2480,7 @@ product PANASONIC KXLRW32AN 0x0d09 CD-R
product PANASONIC KXLCB20AN 0x0d0a CD-R Drive KXL-CB20AN
product PANASONIC KXLCB35AN 0x0d0e DVD-ROM & CD-R/RW
product PANASONIC SDCAAE 0x1b00 MultiMediaCard Adapter
+product PANASONIC DMCFS45 0x2372 Lumix Camera DMC-FS45
product PANASONIC TYTP50P6S 0x3900 TY-TP50P6-S 50in Touch Panel
/* PARA Industrial products */
@@ -2677,7 +2682,9 @@ product RALINK RT3071 0x3071 RT3071
product RALINK RT3072 0x3072 RT3072
product RALINK RT3370 0x3370 RT3370
product RALINK RT3572 0x3572 RT3572
+product RALINK RT3573 0x3573 RT3573
product RALINK RT5370 0x5370 RT5370
+product RALINK RT5572 0x5572 RT5572
product RALINK MT7610U 0x7610 MT7610U
product RALINK RT8070 0x8070 RT8070
product RALINK RT2570_3 0x9020 RT2570
@@ -2976,6 +2983,7 @@ product SITECOMEU WL353 0x0045 WL-353
product SITECOMEU RT3072_3 0x0047 RT3072
product SITECOMEU RT3072_4 0x0048 RT3072
product SITECOMEU WL349V1 0x004b WL-349 v1
+product SITECOMEU RT3072_6 0x004d RT3072
product SITECOMEU WL349V4 0x0050 WL-349 v4
product SITECOMEU RT3070_1 0x0051 RT3070
product SITECOMEU RTL8188CU 0x0052 RTL8188CU
@@ -3428,7 +3436,6 @@ product ZYDAS ZD1211B_2 0xb215 ZD1211B
/* ZyXEL Communication Co. products */
product ZYXEL OMNI56K 0x1500 Omni 56K Plus
product ZYXEL 980N 0x2011 Scorpion-980N keyboard
-product ZYXEL G200V2 0x3407 G-200 v2
product ZYXEL ZYAIRG220 0x3401 ZyAIR G-220
product ZYXEL G200V2 0x3407 G-200 v2
product ZYXEL AG225H 0x3409 AG-225H
