- add IDs for various USB HID UPS devices, extracted from NUT

- switch to generic naming ("Somevendor UPS") where the vendor uses
the same device ID for several devices

feedback/ok deraadt@

1 files changed, 30 insertions, 7 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 4f12d1cc2d7..12051436f62 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.541 2011/03/08 15:20:20 jasper Exp $
+$OpenBSD: usbdevs,v 1.542 2011/03/09 17:01:22 sthen Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -89,7 +89,7 @@ vendor KYE		0x0458	KYE Systems
 vendor DIAMOND2		0x045a	Diamond (Supra)
 vendor MICROSOFT	0x045e	Microsoft
 vendor PRIMAX		0x0461	Primax Electronics
-vendor MGE		0x0463	MGE UPS Systems
+vendor MGE		0x0463	Eaton (MGE)
 vendor AMP		0x0464	AMP
 vendor CHERRY		0x046a	Cherry Mikroschalter
 vendor MEGATRENDS	0x046b	American Megatrends
@@ -98,6 +98,7 @@ vendor BTC		0x046e	Behavior Tech. Computer
 vendor PHILIPS		0x0471	Philips
 vendor SANYO		0x0474	Sanyo Electric
 vendor CONNECTIX	0x0478	Connectix
+vendor DELL2		0x047c	Dell
 vendor KENSINGTON	0x047d	Kensington
 vendor LUCENT		0x047e	Lucent
 vendor PLANTRONICS	0x047f	Plantronics
@@ -273,6 +274,7 @@ vendor EICON		0x0734	Eicon Networks
 vendor SYNTECH		0x0745	Syntech Information
 vendor DIGITALSTREAM	0x074e	Digital Stream
 vendor AUREAL		0x0755	Aureal Semiconductor
+vendor IDOWELL		0x075d	iDowell
 vendor MIDIMAN		0x0763	Midiman
 vendor CYBERPOWER	0x0764	CyberPower
 vendor SURECOM		0x0769	Surecom Technology
@@ -461,6 +463,7 @@ vendor HYUNDAI		0x106c	Hyundai
 vendor GCTSEMICON	0x1076	GCT Semiconductor
 vendor SILABS2		0x10a6	SILABS2
 vendor USI		0x10ab	USI
+vendor LIEBERT2		0x10af	Liebert
 vendor PLX		0x10b5	PLX
 vendor ASANTE		0x10bd	Asante
 vendor SILABS		0x10c4	Silicon Labs
@@ -829,7 +832,8 @@ product AMBIT WLAN		0x0302	WLAN
 product AMBIT NTL_250		0x6098	NTL 250 cable modem
 
 /* American Power Conversion products */
-product APC UPSPRO500		0x0002	Back-UPS Pro 500
+product APC UPS			0x0002	UPS
+product APC UPS5G		0x0003	5G UPS
 
 /* Amigo Technology products */
 product AMIGO RT2870_1		0x9031	RT2870
@@ -1050,10 +1054,16 @@ product BELKIN F5D5050		0x0121	F5D5050 Ethernet
 product BELKIN F5U234		0x0234	F5U234 USB 2.0 4-Port Hub
 product BELKIN F5U237		0x0237	F5U237 USB 2.0 7-Port Hub
 product BELKIN F5U257		0x0257	F5U257 Serial
+product BELKIN F6H375		0x0375	F6H375 UPS
 product BELKIN F5U409		0x0409	F5U409 Serial
 product BELKIN F6C550AVR	0x0551	F6C550-AVR UPS
+product BELKIN F6C1250EITWRK	0x0750	F6C1250EITW-RK UPS
 product BELKIN F6C1500EITWRK	0x0751	F6C1500EITW-RK UPS
+product BELKIN F6C900		0x0900	F6C900 UPS
+product BELKIN F6C100		0x0910	F6C100 UPS
 product BELKIN F6C120		0x0912	F6C120 UPS
+product BELKIN F6C800		0x0980	F6C800 UPS
+product BELKIN F6C1100		0x1100	F6C1100/1200 UPS
 product BELKIN RTL8188CU	0x1102	RTL8188CU
 product BELKIN F5U120		0x1203	F5U120-PC Hub
 product BELKIN ZD1211B		0x4050	ZD1211B
@@ -1263,7 +1273,9 @@ product CSR BLUECORE		0x1000	BlueCore
 product CTX EX1300		0x9999	Ex1300 hub
 
 /* CyberPower products */
-product CYBERPOWER 1500		0x0501	1500
+product CYBERPOWER UPS		0x0005	UPS
+product CYBERPOWER 1500		0x0501	1500 UPS
+product CYBERPOWER OR2200	0x0601	OR2200 UPS
 
 /* CyberTAN Technology products */
 product CYBERTAN GIGASET108	0x160c	Siemens Gigaset 108
@@ -1304,6 +1316,7 @@ product	DELL PRISM_GT_2		0x8104	PrismGT USB 2.0 WLAN
 product DELL W5500		0x8115	W5500 HSDPA 
 product DELL U740		0x8135	Dell U740 CDMA
 product DELL EU870D		0x8138	EU870D HSDPA
+product DELL2 UPS		0xFFFF	UPS
 
 /* DeLorme products */
 product DELORME EMUSB		0x0100	Earthmate GPS
@@ -1924,6 +1937,12 @@ product HP 568J			0x1116  Jornada 568
 product HP 930C			0x1204	DeskJet 930c
 product HP P2000U		0x1801	Inkjet P-2000U
 product HP HS2300		0x1e1d  HS2300
+product HP T750			0x1f06	T750 UPS
+product HP T1000		0x1f08	T1000 UPS
+product HP T1500		0x1f09	T1500 UPS
+product HP RT2200		0x1f0a	R/T2200 UPS
+product HP R1500G2		0x1fe0	R1500 G2 UPS
+product HP T750G2		0x1fe1	T750 G2 UPS
 product HP 640C			0x2004	DeskJet 640c
 product HP P1100		0x3102	Photosmart P1100
 product HP HN210E		0x811c	HN210E Ethernet
@@ -1977,6 +1996,9 @@ product ICOM RP4000VR		0x0011	ID-RP4000V service R
 product ICOM RP2000VT		0x0012	ID-RP2000V service T
 product ICOM RP2000VR		0x0013	ID-RP2000V service R
 
+/* iDowell products */
+product IDOWELL IDOWELL		0x0300	UPS
+
 /* ID TECH products */
 product IDTECH SERIAL		0x0300	Serial
 
@@ -2193,7 +2215,8 @@ product LEXAR 2662WAR		0xa002	2662W-AR
 product LEXMARK S2450		0x0009	Optra S 2450
 
 /* Liebert products */
-product LIEBERT POWERSURE_PXT	0xffff	PowerSure Personal XT
+product LIEBERT UPS		0xffff	UPS
+product LIEBERT2 PSA		0x0001	PowerSure PSA UPS
 
 /* Linksys products */
 product LINKSYS4 USB1000	0x0039	USB1000
@@ -2612,8 +2635,8 @@ product METAGEEK WISPY24I	0x2400	Wi-Spy 2.4i
 product METRICOM RICOCHET_GS	0x0001	Ricochet GS
 
 /* MGE UPS Systems products */
-product MGE UPS1		0x0001	Protection Center 1 UPS
-product MGE UPS2		0xffff	Protection Center 2 UPS
+product MGE UPS1		0x0001	UPS
+product MGE UPS2		0xffff	UPS
 
 /* Modacom products */
 product MODACOM MWIMAX		0x1240	MODACOM Mobile wimax adaptor