sync

2 files changed, 125 insertions, 18 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 4aee3afe471..3541efa058c 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.551 2011/03/08 15:20:34 jasper Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.552 2011/03/09 17:02:20 sthen Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	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 $ */
 
@@ -96,7 +96,7 @@
 #define	USB_VENDOR_DIAMOND2	0x045a		/* Diamond (Supra) */
 #define	USB_VENDOR_MICROSOFT	0x045e		/* Microsoft */
 #define	USB_VENDOR_PRIMAX	0x0461		/* Primax Electronics */
-#define	USB_VENDOR_MGE	0x0463		/* MGE UPS Systems */
+#define	USB_VENDOR_MGE	0x0463		/* Eaton (MGE) */
 #define	USB_VENDOR_AMP	0x0464		/* AMP */
 #define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter */
 #define	USB_VENDOR_MEGATRENDS	0x046b		/* American Megatrends */
@@ -105,6 +105,7 @@
 #define	USB_VENDOR_PHILIPS	0x0471		/* Philips */
 #define	USB_VENDOR_SANYO	0x0474		/* Sanyo Electric */
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix */
+#define	USB_VENDOR_DELL2	0x047c		/* Dell */
 #define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_PLANTRONICS	0x047f		/* Plantronics */
@@ -280,6 +281,7 @@
 #define	USB_VENDOR_SYNTECH	0x0745		/* Syntech Information */
 #define	USB_VENDOR_DIGITALSTREAM	0x074e		/* Digital Stream */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
+#define	USB_VENDOR_IDOWELL	0x075d		/* iDowell */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_CYBERPOWER	0x0764		/* CyberPower */
 #define	USB_VENDOR_SURECOM	0x0769		/* Surecom Technology */
@@ -468,6 +470,7 @@
 #define	USB_VENDOR_GCTSEMICON	0x1076		/* GCT Semiconductor */
 #define	USB_VENDOR_SILABS2	0x10a6		/* SILABS2 */
 #define	USB_VENDOR_USI	0x10ab		/* USI */
+#define	USB_VENDOR_LIEBERT2	0x10af		/* Liebert */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
 #define	USB_VENDOR_SILABS	0x10c4		/* Silicon Labs */
@@ -836,7 +839,8 @@
 #define	USB_PRODUCT_AMBIT_NTL_250	0x6098		/* NTL 250 cable modem */
 
 /* American Power Conversion products */
-#define	USB_PRODUCT_APC_UPSPRO500	0x0002		/* Back-UPS Pro 500 */
+#define	USB_PRODUCT_APC_UPS	0x0002		/* UPS */
+#define	USB_PRODUCT_APC_UPS5G	0x0003		/* 5G UPS */
 
 /* Amigo Technology products */
 #define	USB_PRODUCT_AMIGO_RT2870_1	0x9031		/* RT2870 */
@@ -1057,10 +1061,16 @@
 #define	USB_PRODUCT_BELKIN_F5U234	0x0234		/* F5U234 USB 2.0 4-Port Hub */
 #define	USB_PRODUCT_BELKIN_F5U237	0x0237		/* F5U237 USB 2.0 7-Port Hub */
 #define	USB_PRODUCT_BELKIN_F5U257	0x0257		/* F5U257 Serial */
+#define	USB_PRODUCT_BELKIN_F6H375	0x0375		/* F6H375 UPS */
 #define	USB_PRODUCT_BELKIN_F5U409	0x0409		/* F5U409 Serial */
 #define	USB_PRODUCT_BELKIN_F6C550AVR	0x0551		/* F6C550-AVR UPS */
+#define	USB_PRODUCT_BELKIN_F6C1250EITWRK	0x0750		/* F6C1250EITW-RK UPS */
 #define	USB_PRODUCT_BELKIN_F6C1500EITWRK	0x0751		/* F6C1500EITW-RK UPS */
+#define	USB_PRODUCT_BELKIN_F6C900	0x0900		/* F6C900 UPS */
+#define	USB_PRODUCT_BELKIN_F6C100	0x0910		/* F6C100 UPS */
 #define	USB_PRODUCT_BELKIN_F6C120	0x0912		/* F6C120 UPS */
+#define	USB_PRODUCT_BELKIN_F6C800	0x0980		/* F6C800 UPS */
+#define	USB_PRODUCT_BELKIN_F6C1100	0x1100		/* F6C1100/1200 UPS */
 #define	USB_PRODUCT_BELKIN_RTL8188CU	0x1102		/* RTL8188CU */
 #define	USB_PRODUCT_BELKIN_F5U120	0x1203		/* F5U120-PC Hub */
 #define	USB_PRODUCT_BELKIN_ZD1211B	0x4050		/* ZD1211B */
@@ -1270,7 +1280,9 @@
 #define	USB_PRODUCT_CTX_EX1300	0x9999		/* Ex1300 hub */
 
 /* CyberPower products */
-#define	USB_PRODUCT_CYBERPOWER_1500	0x0501		/* 1500 */
+#define	USB_PRODUCT_CYBERPOWER_UPS	0x0005		/* UPS */
+#define	USB_PRODUCT_CYBERPOWER_1500	0x0501		/* 1500 UPS */
+#define	USB_PRODUCT_CYBERPOWER_OR2200	0x0601		/* OR2200 UPS */
 
 /* CyberTAN Technology products */
 #define	USB_PRODUCT_CYBERTAN_GIGASET108	0x160c		/* Siemens Gigaset 108 */
@@ -1311,6 +1323,7 @@
 #define	USB_PRODUCT_DELL_W5500	0x8115		/* W5500 HSDPA */
 #define	USB_PRODUCT_DELL_U740	0x8135		/* Dell U740 CDMA */
 #define	USB_PRODUCT_DELL_EU870D	0x8138		/* EU870D HSDPA */
+#define	USB_PRODUCT_DELL2_UPS	0xFFFF		/* UPS */
 
 /* DeLorme products */
 #define	USB_PRODUCT_DELORME_EMUSB	0x0100		/* Earthmate GPS */
@@ -1931,6 +1944,12 @@
 #define	USB_PRODUCT_HP_930C	0x1204		/* DeskJet 930c */
 #define	USB_PRODUCT_HP_P2000U	0x1801		/* Inkjet P-2000U */
 #define	USB_PRODUCT_HP_HS2300	0x1e1d		/* HS2300 */
+#define	USB_PRODUCT_HP_T750	0x1f06		/* T750 UPS */
+#define	USB_PRODUCT_HP_T1000	0x1f08		/* T1000 UPS */
+#define	USB_PRODUCT_HP_T1500	0x1f09		/* T1500 UPS */
+#define	USB_PRODUCT_HP_RT2200	0x1f0a		/* R/T2200 UPS */
+#define	USB_PRODUCT_HP_R1500G2	0x1fe0		/* R1500 G2 UPS */
+#define	USB_PRODUCT_HP_T750G2	0x1fe1		/* T750 G2 UPS */
 #define	USB_PRODUCT_HP_640C	0x2004		/* DeskJet 640c */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 #define	USB_PRODUCT_HP_HN210E	0x811c		/* HN210E Ethernet */
@@ -1984,6 +2003,9 @@
 #define	USB_PRODUCT_ICOM_RP2000VT	0x0012		/* ID-RP2000V service T */
 #define	USB_PRODUCT_ICOM_RP2000VR	0x0013		/* ID-RP2000V service R */
 
+/* iDowell products */
+#define	USB_PRODUCT_IDOWELL_IDOWELL	0x0300		/* UPS */
+
 /* ID TECH products */
 #define	USB_PRODUCT_IDTECH_SERIAL	0x0300		/* Serial */
 
@@ -2200,7 +2222,8 @@
 #define	USB_PRODUCT_LEXMARK_S2450	0x0009		/* Optra S 2450 */
 
 /* Liebert products */
-#define	USB_PRODUCT_LIEBERT_POWERSURE_PXT	0xffff		/* PowerSure Personal XT */
+#define	USB_PRODUCT_LIEBERT_UPS	0xffff		/* UPS */
+#define	USB_PRODUCT_LIEBERT2_PSA	0x0001		/* PowerSure PSA UPS */
 
 /* Linksys products */
 #define	USB_PRODUCT_LINKSYS4_USB1000	0x0039		/* USB1000 */
@@ -2619,8 +2642,8 @@
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
 
 /* MGE UPS Systems products */
-#define	USB_PRODUCT_MGE_UPS1	0x0001		/* Protection Center 1 UPS */
-#define	USB_PRODUCT_MGE_UPS2	0xffff		/* Protection Center 2 UPS */
+#define	USB_PRODUCT_MGE_UPS1	0x0001		/* UPS */
+#define	USB_PRODUCT_MGE_UPS2	0xffff		/* UPS */
 
 /* Modacom products */
 #define	USB_PRODUCT_MODACOM_MWIMAX	0x1240		/* MODACOM Mobile wimax adaptor */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 8e20042b9c6..36708ae1269 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.545 2011/03/08 15:20:34 jasper Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.546 2011/03/09 17:02:20 sthen Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	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 $ */
 
@@ -610,8 +610,12 @@ const struct usb_known_product usb_known_products[] = {
 	    "NTL 250 cable modem",
 	},
 	{
-	    USB_VENDOR_APC, USB_PRODUCT_APC_UPSPRO500,
-	    "Back-UPS Pro 500",
+	    USB_VENDOR_APC, USB_PRODUCT_APC_UPS,
+	    "UPS",
+	},
+	{
+	    USB_VENDOR_APC, USB_PRODUCT_APC_UPS5G,
+	    "5G UPS",
 	},
 	{
 	    USB_VENDOR_AMIGO, USB_PRODUCT_AMIGO_RT2870_1,
@@ -1226,6 +1230,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "F5U257 Serial",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6H375,
+	    "F6H375 UPS",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409,
 	    "F5U409 Serial",
 	},
@@ -1234,14 +1242,34 @@ const struct usb_known_product usb_known_products[] = {
 	    "F6C550-AVR UPS",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1250EITWRK,
+	    "F6C1250EITW-RK UPS",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1500EITWRK,
 	    "F6C1500EITW-RK UPS",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C900,
+	    "F6C900 UPS",
+	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C100,
+	    "F6C100 UPS",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C120,
 	    "F6C120 UPS",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C800,
+	    "F6C800 UPS",
+	},
+	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C1100,
+	    "F6C1100/1200 UPS",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RTL8188CU,
 	    "RTL8188CU",
 	},
@@ -1830,8 +1858,16 @@ const struct usb_known_product usb_known_products[] = {
 	    "Ex1300 hub",
 	},
 	{
+	    USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_UPS,
+	    "UPS",
+	},
+	{
 	    USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500,
-	    "1500",
+	    "1500 UPS",
+	},
+	{
+	    USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_OR2200,
+	    "OR2200 UPS",
 	},
 	{
 	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_GIGASET108,
@@ -1946,6 +1982,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "EU870D HSDPA",
 	},
 	{
+	    USB_VENDOR_DELL2, USB_PRODUCT_DELL2_UPS,
+	    "UPS",
+	},
+	{
 	    USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EMUSB,
 	    "Earthmate GPS",
 	},
@@ -3894,6 +3934,30 @@ const struct usb_known_product usb_known_products[] = {
 	    "HS2300",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_T750,
+	    "T750 UPS",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_T1000,
+	    "T1000 UPS",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_T1500,
+	    "T1500 UPS",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_RT2200,
+	    "R/T2200 UPS",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_R1500G2,
+	    "R1500 G2 UPS",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_T750G2,
+	    "T750 G2 UPS",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
 	    "DeskJet 640c",
 	},
@@ -4038,6 +4102,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "ID-RP2000V service R",
 	},
 	{
+	    USB_VENDOR_IDOWELL, USB_PRODUCT_IDOWELL_IDOWELL,
+	    "UPS",
+	},
+	{
 	    USB_VENDOR_IDTECH, USB_PRODUCT_IDTECH_SERIAL,
 	    "Serial",
 	},
@@ -4610,8 +4678,12 @@ const struct usb_known_product usb_known_products[] = {
 	    "Optra S 2450",
 	},
 	{
-	    USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_POWERSURE_PXT,
-	    "PowerSure Personal XT",
+	    USB_VENDOR_LIEBERT, USB_PRODUCT_LIEBERT_UPS,
+	    "UPS",
+	},
+	{
+	    USB_VENDOR_LIEBERT2, USB_PRODUCT_LIEBERT2_PSA,
+	    "PowerSure PSA UPS",
 	},
 	{
 	    USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_USB1000,
@@ -6143,11 +6215,11 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1,
-	    "Protection Center 1 UPS",
+	    "UPS",
 	},
 	{
 	    USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2,
-	    "Protection Center 2 UPS",
+	    "UPS",
 	},
 	{
 	    USB_VENDOR_MODACOM, USB_PRODUCT_MODACOM_MWIMAX,
@@ -9923,7 +9995,7 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	},
 	{
 	    USB_VENDOR_MGE,
-	    "MGE UPS Systems",
+	    "Eaton (MGE)",
 	},
 	{
 	    USB_VENDOR_AMP,
@@ -9958,6 +10030,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Connectix",
 	},
 	{
+	    USB_VENDOR_DELL2,
+	    "Dell",
+	},
+	{
 	    USB_VENDOR_KENSINGTON,
 	    "Kensington",
 	},
@@ -10658,6 +10734,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Aureal Semiconductor",
 	},
 	{
+	    USB_VENDOR_IDOWELL,
+	    "iDowell",
+	},
+	{
 	    USB_VENDOR_MIDIMAN,
 	    "Midiman",
 	},
@@ -11410,6 +11490,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "USI",
 	},
 	{
+	    USB_VENDOR_LIEBERT2,
+	    "Liebert",
+	},
+	{
 	    USB_VENDOR_PLX,
 	    "PLX",
 	},