sync

2 files changed, 125 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 815487eea2b..dc81baadac5 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.155 2005/04/15 13:45:29 jakob Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.156 2005/04/16 14:56:04 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.151 2005/04/15 13:44:40 jakob Exp 
+ *	OpenBSD: usbdevs,v 1.152 2005/04/16 14:55:10 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -393,6 +393,7 @@
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
+#define	USB_VENDOR_ANALOG	0x1110		/* Analog Devices, Inc. */
 #define	USB_VENDOR_JRC	0x1145		/* Japan Radio Company */
 #define	USB_VENDOR_SERVERWORKS	0x1166		/* ServerWorks */
 #define	USB_VENDOR_ACERCM	0x1189		/* Acer Communications & Multimedia */
@@ -572,6 +573,16 @@
 /* American Power Conversion products */
 #define	USB_PRODUCT_APC_UPSPRO500	0x0002		/* Back-UPS Pro 500 */
 
+/* Analog Devices, Inc. products */
+#define	USB_PRODUCT_ANALOG_EAGLEI	0x900f		/* Eagle I */
+#define	USB_PRODUCT_ANALOG_EAGLEI_NF	0x9010		/* Eagle I */
+#define	USB_PRODUCT_ANALOG_EAGLEII	0x9021		/* Eagle II */
+#define	USB_PRODUCT_ANALOG_EAGLEII_NF	0x9022		/* Eagle II */
+#define	USB_PRODUCT_ANALOG_EAGLEIIC	0x9023		/* Eagle IIC */
+#define	USB_PRODUCT_ANALOG_EAGLEIIC_NF	0x9024		/* Eagle IIC */
+#define	USB_PRODUCT_ANALOG_EAGLEIII	0x9031		/* Eagle III */
+#define	USB_PRODUCT_ANALOG_EAGLEIII_NF	0x9032		/* Eagle III */
+
 /* Anchor products */
 #define	USB_PRODUCT_ANCHOR_EZUSB	0x2131		/* EZUSB */
 #define	USB_PRODUCT_ANCHOR_EZLINK	0x2720		/* EZLINK */
@@ -1794,6 +1805,14 @@
 
 /* U.S. Robotics products */
 #define	USB_PRODUCT_USR_USR1120	0x00eb		/* USR1120 WLAN */
+#define	USB_PRODUCT_USR_MILLER_A	0x00f1		/* USR9000 SureConnect ADSL */
+#define	USB_PRODUCT_USR_MILLER_A_NF	0x00f2		/* USR9000 SureConnect ADSL */
+#define	USB_PRODUCT_USR_HEINEKEN_A	0x00f5		/* USR9000 SureConnect ADSL */
+#define	USB_PRODUCT_USR_HEINEKEN_A_NF	0x00f6		/* USR9000 SureConnect ADSL */
+#define	USB_PRODUCT_USR_HEINEKEN_B	0x00f7		/* USR9000 SureConnect ADSL */
+#define	USB_PRODUCT_USR_HEINEKEN_B_NF	0x00f8		/* USR9000 SureConnect ADSL */
+#define	USB_PRODUCT_USR_MILLER_B	0x00f9		/* USR9000 SureConnect ADSL */
+#define	USB_PRODUCT_USR_MILLER_B_NF	0x00fa		/* USR9000 SureConnect ADSL */
 
 /* ViewSonic products */
 #define	USB_PRODUCT_VIEWSONIC_G773HUB	0x00fe		/* G773 Monitor Hub */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index fbd6c7ade93..5b657e12bde 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.154 2005/04/15 13:45:29 jakob Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.155 2005/04/16 14:56:04 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.151 2005/04/15 13:44:40 jakob Exp 
+ *	OpenBSD: usbdevs,v 1.152 2005/04/16 14:55:10 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -521,6 +521,54 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Back-UPS Pro 500",
 	},
 	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle I",
+	},
+	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI_NF,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle I",
+	},
+	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEII,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle II",
+	},
+	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEII_NF,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle II",
+	},
+	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIIC,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle IIC",
+	},
+	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIIC_NF,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle IIC",
+	},
+	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIII,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle III",
+	},
+	{
+	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEIII_NF,
+	    0,
+	    "Analog Devices, Inc.",
+	    "Eagle III",
+	},
+	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    0,
 	    "Anchor Chips",
@@ -5123,6 +5171,54 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USR1120 WLAN",
 	},
 	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_A,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_A_NF,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_A,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_A_NF,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_B,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_HEINEKEN_B_NF,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_B,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_MILLER_B_NF,
+	    0,
+	    "U.S. Robotics",
+	    "USR9000 SureConnect ADSL",
+	},
+	{
 	    USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773HUB,
 	    0,
 	    "ViewSonic",
@@ -7307,6 +7403,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ANALOG, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Analog Devices, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_JRC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Japan Radio Company",