sync

2 files changed, 26 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index aeaa91b0fdf..1f9fe51dd13 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.249 2006/12/30 14:09:00 martin Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.250 2007/01/01 22:23:44 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.243 2006/12/30 14:07:58 martin Exp 
+ *	OpenBSD: usbdevs,v 1.244 2007/01/01 22:23:38 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -98,6 +98,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_AMP	0x0464		/* AMP */
 #define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter */
 #define	USB_VENDOR_MEGATRENDS	0x046b		/* American Megatrends */
@@ -780,6 +781,7 @@
 #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_F5U409	0x0409		/* F5U409 Serial */
+#define	USB_PRODUCT_BELKIN_F6C550AVR	0x0551		/* F6C550-AVR UPS */
 #define	USB_PRODUCT_BELKIN_F5U120	0x1203		/* F5U120-PC Hub */
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D705A 54g USB Network Adapter */
@@ -1504,6 +1506,10 @@
 /* Metricom products */
 #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 */
+
 /* Micro Star International products */
 #define	USB_PRODUCT_MSI_WLAN	0x1020		/* WLAN */
 #define	USB_PRODUCT_MSI_BLUETOOTH	0x1967		/* Bluetooth */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index a97aec4d2a9..591d3fcaff8 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.246 2006/12/30 14:09:00 martin Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.247 2007/01/01 22:23:44 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.243 2006/12/30 14:07:58 martin Exp 
+ *	OpenBSD: usbdevs,v 1.244 2007/01/01 22:23:38 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -703,6 +703,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "F5U409 Serial",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR,
+	    "F6C550-AVR UPS",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120,
 	    "F5U120-PC Hub",
 	},
@@ -2639,6 +2643,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Ricochet GS",
 	},
 	{
+	    USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1,
+	    "Protection Center 1 UPS",
+	},
+	{
+	    USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2,
+	    "Protection Center 2 UPS",
+	},
+	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_WLAN,
 	    "WLAN",
 	},
@@ -4691,6 +4703,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Primax Electronics",
 	},
 	{
+	    USB_VENDOR_MGE,
+	    "MGE UPS Systems",
+	},
+	{
 	    USB_VENDOR_AMP,
 	    "AMP",
 	},