sync

1 files changed, 94 insertions, 10 deletions

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",
 	},