Regen.

2 files changed, 84 insertions, 10 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 9bcb8e2..faea123 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.23 2000/05/01 20:26:12 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.24 2000/05/07 19:44:16 n_hibma Exp 
  */
 
 /*
@@ -12,7 +12,7 @@
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (augustss@carlstedt.se) at
+ * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@
 #define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
 #define	USB_VENDOR_ADAPTEC	0x03f3		/* Adaptec, Inc. */
 #define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs, Inc. */
-#define	USB_VENDOR_FUTURE	0x0403		/* Future Technology Devices */
+#define	USB_VENDOR_FTDI	0x0403		/* Future Technology Devices */
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
 #define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak Corp. */
 #define	USB_VENDOR_MELCO	0x0411		/* Melco, Inc. */
@@ -153,6 +153,7 @@
 #define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America, Inc. */
 #define	USB_VENDOR_AIWA	0x0677		/* Aiwa Co., Ltd. */
 #define	USB_VENDOR_ACARD	0x0678		/* ACARD Technology Corp. */
+#define	USB_VENDOR_PROLIFIC	0x067b		/* Prolific Technology Inc. */
 #define	USB_VENDOR_ADVANCELOGIC	0x0680		/* Avance Logic, Inc. */
 #define	USB_VENDOR_ASKEY	0x069a		/* Askey Computer Corp. */
 #define	USB_VENDOR_ALCATELT	0x06b9		/* Alcatel Telecom */
@@ -166,6 +167,7 @@
 #define	USB_VENDOR_SIRIUS	0x06ea		/* Sirius Technologies */
 #define	USB_VENDOR_BOSTON	0x06fd		/* Boston Acoustics */
 #define	USB_VENDOR_SMC	0x0707		/* Standard Microsystems Corp */
+#define	USB_VENDOR_MCT	0x0711		/* MCT Corp. */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
@@ -330,6 +332,7 @@
 /* Cypress Semiconductor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 #define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
+#define	USB_PRODUCT_CYPRESS_FMRADIO	0x1002		/* FM Radio */
 
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
@@ -381,7 +384,7 @@
 #define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
 
 /* Future Technology Devices products */
-#define	USB_PRODUCT_FUTURE_SERIAL	0x8372		/* Serial converter */
+#define	USB_PRODUCT_FTDI_SERIAL	0x8372		/* Serial converter */
 
 /* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
@@ -403,7 +406,8 @@
 
 /* In-System products */
 #define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel printer adapter */
-#define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter */
+#define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter ISD110 */
+#define	USB_PRODUCT_INSYSTEM_ISD105	0x0202		/* IDE adapter ISD105 */
 
 /* Intel products */
 #define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
@@ -453,6 +457,7 @@
 /* Linksys products */
 #define	USB_PRODUCT_LINKSYS_USB10T	0x2202		/* USB10T Ethernet */
 #define	USB_PRODUCT_LINKSYS_USB100TX	0x2203		/* USB100TX Ethernet */
+#define	USB_PRODUCT_LINKSYS_USB100H1	0x2204		/* USB100H1 Ethernet/HPNA */
 #define	USB_PRODUCT_LINKSYS_USB10TA	0x2206		/* USB10TA Ethernet */
 
 /* Logitech products */
@@ -473,6 +478,10 @@
 /* Macally products */
 #define	USB_PRODUCT_MACALLY_MOUSE1	0x0101		/* mouse */
 
+/* MCT Corp. */
+#define	USB_PRODUCT_MCT_HUB0100	0x0100		/* Hub */
+#define	USB_PRODUCT_MCT_USB232	0x0210		/* USB-232 Interface */
+
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LU-ATX Ethernet */
 
@@ -523,6 +532,7 @@
 #define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
+#define	USB_PRODUCT_PHILIPS_PCVC680K	0x0308		/* PCVC680K Vesta Pro PC Camera */
 #define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
 
 /* P.I. Engineering products */
@@ -536,6 +546,10 @@
 #define	USB_PRODUCT_PRIMAX_MOUSEINABOX	0x4d02		/* Mouse-in-a-Box */
 #define	USB_PRODUCT_PRIMAX_PCGAUMS1	0x4d04		/* Sony PCGA-UMS1 */
 
+/* Prolific products */
+#define	USB_PRODUCT_PROLIFIC_PL2301	0x0000		/* PL2301 Host-Host interface */
+#define	USB_PRODUCT_PROLIFIC_PL2302	0x0001		/* PL2302 Host-Host interface */
+
 /* Quickshot products */
 #define	USB_PRODUCT_QUICKSHOT_STRIKEPAD	0x6238		/* USB StrikePad */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 97d05ae..c19ed9f 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.23 2000/05/01 20:26:12 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.24 2000/05/07 19:44:16 n_hibma Exp 
  */
 
 /*
@@ -12,7 +12,7 @@
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (augustss@carlstedt.se) at
+ * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -292,6 +292,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "thermometer",
 	},
 	{
+	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_FMRADIO,
+	    0,
+	    "Cypress Semiconductor",
+	    "FM Radio",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    0,
 	    "D-Link Corp",
@@ -436,7 +442,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Connector for DVD drive",
 	},
 	{
-	    USB_VENDOR_FUTURE, USB_PRODUCT_FUTURE_SERIAL,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL,
 	    0,
 	    "Future Technology Devices",
 	    "Serial converter",
@@ -523,7 +529,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
 	    0,
 	    "In-System Design",
-	    "IDE adapter",
+	    "IDE adapter ISD110",
+	},
+	{
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD105,
+	    0,
+	    "In-System Design",
+	    "IDE adapter ISD105",
 	},
 	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
@@ -664,6 +676,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB100TX Ethernet",
 	},
 	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1,
+	    0,
+	    "Linksys, Inc.",
+	    "USB100H1 Ethernet/HPNA",
+	},
+	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA,
 	    0,
 	    "Linksys, Inc.",
@@ -742,6 +760,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "mouse",
 	},
 	{
+	    USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100,
+	    0,
+	    "MCT Corp.",
+	    "Hub",
+	},
+	{
+	    USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232,
+	    0,
+	    "MCT Corp.",
+	    "USB-232 Interface",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
 	    0,
 	    "Melco, Inc.",
@@ -892,6 +922,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "hub",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K,
+	    0,
+	    "Philips",
+	    "PCVC680K Vesta Pro PC Camera",
+	},
+	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
 	    0,
 	    "Philips",
@@ -928,6 +964,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Sony PCGA-UMS1",
 	},
 	{
+	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301,
+	    0,
+	    "Prolific Technology Inc.",
+	    "PL2301 Host-Host interface",
+	},
+	{
+	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2302,
+	    0,
+	    "Prolific Technology Inc.",
+	    "PL2302 Host-Host interface",
+	},
+	{
 	    USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD,
 	    0,
 	    "Quickshot",
@@ -1096,7 +1144,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    USB_VENDOR_FUTURE, 0,
+	    USB_VENDOR_FTDI, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Future Technology Devices",
 	    NULL,
@@ -1696,6 +1744,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PROLIFIC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Prolific Technology Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ADVANCELOGIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Avance Logic, Inc.",
@@ -1774,6 +1828,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MCT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "MCT Corp.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AUREAL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Aureal Semiconductor",