Regen.

2 files changed, 84 insertions, 17 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index b78042a..a8f0e2d 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.55 2001/04/09 18:45:02 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.57 2001/04/12 11:04:08 n_hibma Exp 
  */
 
 /*
@@ -110,6 +110,7 @@
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson Corp. */
 #define	USB_VENDOR_RAINBOW	0x04b9		/* Rainbow Technologies */
 #define	USB_VENDOR_IODATA	0x04bb		/* I/O Data */
+#define	USB_VENDOR_TDK	0x04bf		/* TDK Corp. */
 #define	USB_VENDOR_3COMUSR	0x04c1		/* U.S. Robotics */
 #define	USB_VENDOR_METHODE	0x04c2		/* Methode Electronics Far East PTE Ltd. */
 #define	USB_VENDOR_MAXISWITCH	0x04c3		/* Maxi Switch, Inc. */
@@ -221,6 +222,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_PUTERCOM	0x0708		/* Putercom Co., Ltd. */
 #define	USB_VENDOR_MCT	0x0711		/* MCT Corp. */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
@@ -346,14 +348,14 @@
 /* Agate Technologies products */
 #define	USB_PRODUCT_AGATE_QDRIVE	0x0378		/* Q-Drive */
 
-/* Agiler products */
-#define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
-
 /* AGFA products */
 #define	USB_PRODUCT_AGFA_SNAPSCAN1212U	0x0001		/* SnapScan 1212U */
 #define	USB_PRODUCT_AGFA_SNAPSCANTOUCH	0x0100		/* SnapScan Touch */
 #define	USB_PRODUCT_AGFA_SNAPSCAN1212U2	0x2061		/* SnapScan 1212U */
 
+/* Agiler products */
+#define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
+
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
@@ -409,8 +411,9 @@
 #define	USB_PRODUCT_BTC_BTC7932	0x6782		/* Keyboard with mouse port */
 
 /* Canon, Inc. products */
-#define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
 #define	USB_PRODUCT_CANON_N656U	0x2206		/* CANOSCAN N656U */
+#define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
+#define	USB_PRODUCT_CANON_S100	0x3045		/* PowerShot S100 */
 
 /* CATC products */
 #define	USB_PRODUCT_CATC_NETMATE	0x000a		/* Netmate ethernet adapter */
@@ -785,6 +788,9 @@
 #define	USB_PRODUCT_PROLIFIC_PL2305	0x2305		/* Parallel printer adapter */
 #define	USB_PRODUCT_PROLIFIC_ATAPI4	0x2307		/* ATAPI-4 Bridge Controller */
 
+/* Putercom products */
+#define	USB_PRODUCT_PUTERCOM_UPA100	0x047e		/* USB-1284 BRIDGE */
+
 /* Qtronix products */
 #define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
 
@@ -844,15 +850,22 @@
 #define	USB_PRODUCT_STSN_STSN0001	0x0001		/* Internet Access Device */
 
 /* Sun Microsystems products */
-#define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
+#define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB keyboard */
 /* XXX The above is a North American PC style keyboard possibly */
+#define	USB_PRODUCT_SUN_MOUSE	0x0100		/* Type 6 USB mouse */
 
 /* Supra products */
 #define	USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K	0x07da		/* Supra Express 56K modem */
 #define	USB_PRODUCT_DIAMOND2_SUPRA2890	0x0b4a		/* SupraMax 2890 56K Modem */
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 USB */
 #define	USB_PRODUCT_DIAMOND2_RIO800USB	0x5002		/* Rio 800 USB */
- 
+
+/* TDK products */
+#define	USB_PRODUCT_TDK_UPA9664	0x0115		/* TDK USB-PDC Adapter UPA9664 */
+#define	USB_PRODUCT_TDK_UCA1464	0x0116		/* TDK USB-cdmaOne Adapter UCA1464 */
+#define	USB_PRODUCT_TDK_UHA6400	0x0117		/* TDK USB-PHS Adapter UHA6400 */
+#define	USB_PRODUCT_TDK_UPA6400	0x0118		/* TDK USB-PHS Adapter UPA6400 */
+
 /* TEAC products */
 #define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB floppy */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 90193e6..1fa0c72 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.55 2001/04/09 18:45:02 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.57 2001/04/12 11:04:08 n_hibma Exp 
  */
 
 /*
@@ -154,12 +154,6 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Q-Drive",
 	},
 	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
-	    0,
-	    "Elecom Corp. Ltd.",
-	    "mouse 29UO",
-	},
-	{
 	    USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U,
 	    0,
 	    "AGFA-Gevaert NV",
@@ -178,6 +172,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "SnapScan 1212U",
 	},
 	{
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
+	    0,
+	    "Elecom Corp. Ltd.",
+	    "mouse 29UO",
+	},
+	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
 	    "Aladdin Knowledge Systems",
@@ -322,16 +322,22 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Keyboard with mouse port",
 	},
 	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
+	    0,
+	    "Canon, Inc.",
+	    "CANOSCAN N656U",
+	},
+	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
 	    0,
 	    "Canon, Inc.",
 	    "PowerShot S10",
 	},
 	{
-	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100,
 	    0,
 	    "Canon, Inc.",
-	    "CANOSCAN N656U",
+	    "PowerShot S100",
 	},
 	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
@@ -1594,6 +1600,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ATAPI-4 Bridge Controller",
 	},
 	{
+	    USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100,
+	    0,
+	    "Putercom Co., Ltd.",
+	    "USB-1284 BRIDGE",
+	},
+	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    0,
 	    "Qtronix Corp",
@@ -1729,7 +1741,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
 	    0,
 	    "Sun Microsystems",
-	    "Type 6 USB",
+	    "Type 6 USB keyboard",
+	},
+	{
+	    USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE,
+	    0,
+	    "Sun Microsystems",
+	    "Type 6 USB mouse",
 	},
 	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
@@ -1756,6 +1774,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Rio 800 USB",
 	},
 	{
+	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA9664,
+	    0,
+	    "TDK Corp.",
+	    "TDK USB-PDC Adapter UPA9664",
+	},
+	{
+	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UCA1464,
+	    0,
+	    "TDK Corp.",
+	    "TDK USB-cdmaOne Adapter UCA1464",
+	},
+	{
+	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400,
+	    0,
+	    "TDK Corp.",
+	    "TDK USB-PHS Adapter UHA6400",
+	},
+	{
+	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA6400,
+	    0,
+	    "TDK Corp.",
+	    "TDK USB-PHS Adapter UPA6400",
+	},
+	{
 	    USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB,
 	    0,
 	    "TEAC",
@@ -2206,6 +2248,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_TDK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "TDK Corp.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_3COMUSR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "U.S. Robotics",
@@ -2872,6 +2920,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PUTERCOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Putercom Co., Ltd.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MCT, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "MCT Corp.",