more uplcom and umct; jsg@goblin.cx pulled from netbsd

3 files changed, 27 insertions, 3 deletions

diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 045d89e3f4e..e52e8be45a9 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.12 2004/07/11 07:39:38 deraadt Exp $	*/
+/*	$OpenBSD: umct.c,v 1.13 2004/09/20 21:34:46 deraadt Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -151,6 +151,8 @@ static const struct usb_devno umct_devs[] = {
 	{ USB_VENDOR_MCT, USB_PRODUCT_MCT_DU_H3SP_USB232 },
 	/* BELKIN F5U109 */
 	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109 },
+	/* BELKIN F5U409 */
+	{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409 },
 };
 #define umct_lookup(v, p) usb_lookup(umct_devs, v, p)
 
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index fc7b6fddd18..0fd2da36f28 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.14 2004/09/20 06:01:04 deraadt Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.15 2004/09/20 21:34:46 deraadt Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -157,6 +157,8 @@ static const struct usb_devno uplcom_devs[] = {
 	{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A },
 	/* IOGEAR/ATEN UC-232A */
 	{ USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303 },
+	/* IOGEAR/ATENTRIPPLITE U209 */
+	{ USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209 },
 	/* ELECOM UC-SGT */
 	{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT },
 	{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0 },
@@ -170,6 +172,12 @@ static const struct usb_devno uplcom_devs[] = {
 	{ USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU11 },
 	/* Sitecom USB to Serial. */
 	{ USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104 },
+	/* SOURCENEXT KeikaiDenwa 8 */
+	{ USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8 },
+	/* SOURCENEXT KeikaiDenwa 8 with charger */
+	{ USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG },
+	/* HAL Corporation Crossam2+USB */
+	{ USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001 },
 };
 #define uplcom_lookup(v, p) usb_lookup(uplcom_devs, v, p)
 
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index ea09affd483..0182213793e 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$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 $ */
 
 /*
@@ -285,6 +285,7 @@ vendor BROADLOGIC	0x0827	BroadLogic
 vendor HANDSPRING	0x082d	Handspring
 vendor ACTIONSTAR	0x0835	Action Star Enterprise
 vendor PALM		0x0830	Palm Computing
+vendor SOURCENEXT	0x0833	SOURCENEXT
 vendor ACCTON		0x083a	Accton Technology
 vendor DIAMOND		0x0841	Diamond
 vendor NETGEAR		0x0846	BayNETGEAR
@@ -343,6 +344,7 @@ vendor GEOCAST		0x0a79	Geocast Network Systems
 vendor NEODIO		0x0aec  Neodio
 vendor TODOS		0x0b0c	Todos Data System
 vendor SIIG2		0x0b39	SIIG
+vendor HAL		0x0b41	HAL Corporation
 vendor NEC2		0x0b62	NEC
 vendor ATI2		0x0b6f	ATI
 vendor KURUSUGAWA	0x0b7e	Kurusugawa Electronics, Inc.
@@ -376,6 +378,7 @@ vendor INSIDEOUT	0x1608	Inside Out Networks
 vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics
 vendor DLINK		0x2001	D-Link
+vendor TRIPPLITE	0x2478	Tripp-Lite
 vendor NHJ		0x2770  NHJ
 vendor PQI		0x3538	PQI
 vendor DAISY		0x3579	Daisy Technology
@@ -536,6 +539,7 @@ product AVISION 1200U		0x0268	1200U
 product BELKIN2 F5U002		0x0002	F5U002 Parallel
 product BELKIN F5U103		0x0103	F5U103 Serial
 product BELKIN F5U109		0x0109	F5U109 Serial
+product BELKIN F5U409		0x0409	F5U409 Serial
 product BELKIN SCSI		0x0115	SCSI
 product BELKIN USB2LAN		0x0121	USB to LAN Converter
 product BELKIN F5U120		0x1203	F5U120-PC Hub
@@ -777,6 +781,9 @@ product HAGIWARA FGSM		0x0002  FlashGate SmartMedia
 product HAGIWARA FGCF		0x0003  FlashGate CompactFlash
 product HAGIWARA FG		0x0005  FlashGate
 
+/* HAL Corporation products */
+product HAL IMR001		0x0011	Crossam2+USB IR commander
+
 /* Handspring, Inc. */
 product HANDSPRING VISOR	0x0100	Handspring Visor
 product HANDSPRING TREO		0x0200	Handspring Treo
@@ -1440,6 +1447,10 @@ product SONY CLIE_41		0x009a	Clie v4.1
 product SONY CLIE_NX60		0x00da	Sony Clie nx60
 product SONY CLIE_TJ25		0x0169	Sony Clie tj25
 
+/* SOURCENEXT products */
+product SOURCENEXT KEIKAI8	0x039f	KeikaiDenwa 8
+product SOURCENEXT KEIKAI8_CHG	0x012e	KeikaiDenwa 8 with charger
+
 /* STMicroelectronics products */
 product STMICRO COMMUNICATOR	0x7554	Communicator
 
@@ -1508,6 +1519,9 @@ product	TODOS ARGOS_MINI	0x0002	Argos Mini Smartcard
 product TREK THUMBDRIVE		0x1111	ThumbDrive
 product TREK THUMBDRIVE_8MB	0x9988	ThumbDrive 8MB
 
+/* Tripp-Lite products */
+product TRIPPLITE U209		0x2008	U209 Serial
+
 /* Trumpion products */
 product	TRUMPION T33521		0x1003	USB/MP3 decoder
 product TRUMPION XXX1100	0x1100	XXX 1100