sync

2 files changed, 66 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 49e1edaae46..9855896c65a 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.110 2004/09/20 06:09:39 mickey Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.111 2004/09/20 21:34:50 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.106 2004/09/20 06:01:04 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.107 2004/09/20 21:34:46 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -292,6 +292,7 @@
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring */
 #define	USB_VENDOR_ACTIONSTAR	0x0835		/* Action Star Enterprise */
 #define	USB_VENDOR_PALM	0x0830		/* Palm Computing */
+#define	USB_VENDOR_SOURCENEXT	0x0833		/* SOURCENEXT */
 #define	USB_VENDOR_ACCTON	0x083a		/* Accton Technology */
 #define	USB_VENDOR_DIAMOND	0x0841		/* Diamond */
 #define	USB_VENDOR_NETGEAR	0x0846		/* BayNETGEAR */
@@ -350,6 +351,7 @@
 #define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_SIIG2	0x0b39		/* SIIG */
+#define	USB_VENDOR_HAL	0x0b41		/* HAL Corporation */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
 #define	USB_VENDOR_KURUSUGAWA	0x0b7e		/* Kurusugawa Electronics, Inc. */
@@ -383,6 +385,7 @@
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
+#define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
 #define	USB_VENDOR_PQI	0x3538		/* PQI */
 #define	USB_VENDOR_DAISY	0x3579		/* Daisy Technology */
@@ -543,6 +546,7 @@
 #define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel */
 #define	USB_PRODUCT_BELKIN_F5U103	0x0103		/* F5U103 Serial */
 #define	USB_PRODUCT_BELKIN_F5U109	0x0109		/* F5U109 Serial */
+#define	USB_PRODUCT_BELKIN_F5U409	0x0409		/* F5U409 Serial */
 #define	USB_PRODUCT_BELKIN_SCSI	0x0115		/* SCSI */
 #define	USB_PRODUCT_BELKIN_USB2LAN	0x0121		/* USB to LAN Converter */
 #define	USB_PRODUCT_BELKIN_F5U120	0x1203		/* F5U120-PC Hub */
@@ -784,6 +788,9 @@
 #define	USB_PRODUCT_HAGIWARA_FGCF	0x0003		/* FlashGate CompactFlash */
 #define	USB_PRODUCT_HAGIWARA_FG	0x0005		/* FlashGate */
 
+/* HAL Corporation products */
+#define	USB_PRODUCT_HAL_IMR001	0x0011		/* Crossam2+USB IR commander */
+
 /* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 #define	USB_PRODUCT_HANDSPRING_TREO	0x0200		/* Handspring Treo */
@@ -1447,6 +1454,10 @@
 #define	USB_PRODUCT_SONY_CLIE_NX60	0x00da		/* Sony Clie nx60 */
 #define	USB_PRODUCT_SONY_CLIE_TJ25	0x0169		/* Sony Clie tj25 */
 
+/* SOURCENEXT products */
+#define	USB_PRODUCT_SOURCENEXT_KEIKAI8	0x039f		/* KeikaiDenwa 8 */
+#define	USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG	0x012e		/* KeikaiDenwa 8 with charger */
+
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* Communicator */
 
@@ -1515,6 +1526,9 @@
 #define	USB_PRODUCT_TREK_THUMBDRIVE	0x1111		/* ThumbDrive */
 #define	USB_PRODUCT_TREK_THUMBDRIVE_8MB	0x9988		/* ThumbDrive 8MB */
 
+/* Tripp-Lite products */
+#define	USB_PRODUCT_TRIPPLITE_U209	0x2008		/* U209 Serial */
+
 /* Trumpion products */
 #define	USB_PRODUCT_TRUMPION_T33521	0x1003		/* USB/MP3 decoder */
 #define	USB_PRODUCT_TRUMPION_XXX1100	0x1100		/* XXX 1100 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 6ccbcf3aef8..e3d548dafa5 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.110 2004/09/20 06:09:39 mickey Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.111 2004/09/20 21:34:50 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.106 2004/09/20 06:01:04 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.107 2004/09/20 21:34:46 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -545,6 +545,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "F5U109 Serial",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409,
+	    0,
+	    "Belkin Components",
+	    "F5U409 Serial",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI,
 	    0,
 	    "Belkin Components",
@@ -1415,6 +1421,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FlashGate",
 	},
 	{
+	    USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001,
+	    0,
+	    "HAL Corporation",
+	    "Crossam2+USB IR commander",
+	},
+	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
 	    "Handspring",
@@ -4067,6 +4079,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sony Clie tj25",
 	},
 	{
+	    USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8,
+	    0,
+	    "SOURCENEXT",
+	    "KeikaiDenwa 8",
+	},
+	{
+	    USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG,
+	    0,
+	    "SOURCENEXT",
+	    "KeikaiDenwa 8 with charger",
+	},
+	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
 	    0,
 	    "STMicroelectronics",
@@ -4265,6 +4289,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ThumbDrive 8MB",
 	},
 	{
+	    USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209,
+	    0,
+	    "Tripp-Lite",
+	    "U209 Serial",
+	},
+	{
 	    USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521,
 	    0,
 	    "Trumpion Microelectronics",
@@ -5849,6 +5879,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SOURCENEXT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "SOURCENEXT",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACCTON, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Accton Technology",
@@ -6197,6 +6233,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_HAL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "HAL Corporation",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_NEC2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "NEC",
@@ -6395,6 +6437,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_TRIPPLITE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Tripp-Lite",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_NHJ, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "NHJ",