Simon Dick in FreeBSD PR 96714

* Fossil Abacus Wrist PDA

Thorsten Trampisch in FreeBSD PR 113384
* Expert ISDN Control
* RS232 OptoBridge

Jonathan Charest in FreeBSD PR 110992
* Several Tactrix OpenPort (ECU) devices.

Y.Okabe in FreeBSD PR 119981
* Logitec LAN-GTJ/U2 Ethernet

HAGIMORI 'buggy' Masashige in FreeBSD PR 115933
* RATOC REX-USB60F serial

3 files changed, 16 insertions, 6 deletions

diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index cdb94691871..ef4bdee0199 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.81 2007/11/23 15:43:02 mbalmer Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.82 2008/02/22 12:42:40 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -162,6 +162,7 @@ const struct axe_type axe_devs[] = {
 	{ { USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1}, 0 },
 	{ { USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M}, 0 },
 	{ { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_USB1000 }, AX178 },
+	{ { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LAN_GTJU2}, AX178 },
 	{ { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX}, 0 },
 	{ { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120}, 0 },
 	{ { USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01PLUS }, AX772 },
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index a9aecbaff6b..6dedd4bf3ed 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.44 2007/11/11 02:14:24 deraadt Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.45 2008/02/22 12:42:40 jsg Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -157,7 +157,8 @@ uftdi_match(struct device *parent, void *match, void *aux)
 		     uaa->vendor, uaa->product));
 
 	if (uaa->vendor == USB_VENDOR_FTDI &&
-	    (uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX ||
+	    (uaa->product == USB_PRODUCT_FTDI_EISCOU ||
+	     uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX ||
 	     uaa->product == USB_PRODUCT_FTDI_SERIAL_8U232AM ||
 	     uaa->product == USB_PRODUCT_FTDI_SERIAL_232BM ||
 	     uaa->product == USB_PRODUCT_FTDI_SEMC_DSS20 ||
@@ -178,7 +179,11 @@ uftdi_match(struct device *parent, void *match, void *aux)
 	     uaa->product == USB_PRODUCT_FTDI_LCD_CFA_633 ||
 	     uaa->product == USB_PRODUCT_FTDI_LCD_CFA_634 ||
 	     uaa->product == USB_PRODUCT_FTDI_LCD_CFA_635 ||
-	     uaa->product == USB_PRODUCT_FTDI_MJS_SIRIUS_PC))
+	     uaa->product == USB_PRODUCT_FTDI_MJS_SIRIUS_PC ||
+	     uaa->product == USB_PRODUCT_FTDI_OPENPORT_13M ||
+	     uaa->product == USB_PRODUCT_FTDI_OPENPORT_13S ||
+	     uaa->product == USB_PRODUCT_FTDI_OPENPORT_13U ||
+	     uaa->product == USB_PRODUCT_FTDI_UOPTBR))
 		return (UMATCH_VENDOR_PRODUCT);
 	if (uaa->vendor == USB_VENDOR_IODATA &&
 	     uaa->product == USB_PRODUCT_IODATA_FT232R)
@@ -197,6 +202,9 @@ uftdi_match(struct device *parent, void *match, void *aux)
 	    (uaa->product == USB_PRODUCT_FALCOM_TWIST ||
 	     uaa->product == USB_PRODUCT_FALCOM_SAMBA))
 		 return (UMATCH_VENDOR_PRODUCT);
+	if (uaa->vendor == USB_VENDOR_RATOC &&
+	    (uaa->product == USB_PRODUCT_RATOC_REXUSB60F))
+		return (UMATCH_VENDOR_PRODUCT);
 	if (uaa->vendor == USB_VENDOR_SEALEVEL &&
 	    uaa->product == USB_PRODUCT_SEALEVEL_USBSERIAL)
 		return (UMATCH_VENDOR_PRODUCT);
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 78e44cb09c6..5dbe63c9da8 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvisor.c,v 1.36 2007/10/11 18:33:15 deraadt Exp $	*/
+/*	$OpenBSD: uvisor.c,v 1.37 2008/02/22 12:42:40 jsg Exp $	*/
 /*	$NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $	*/
 
 /*
@@ -177,6 +177,8 @@ struct uvisor_type {
 };
 static const struct uvisor_type uvisor_devs[] = {
 	{{ USB_VENDOR_ACEECA, USB_PRODUCT_ACEECA_MEZ1000 }, PALM4 },
+	{{ USB_VENDOR_FOSSIL, USB_PRODUCT_FOSSIL_WRISTPDA }, PALM4 },
+	{{ USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_IQUE3600 }, PALM4 },
 	{{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR }, VISOR },
 	{{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO }, PALM4 },
 	{{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600 }, VISOR },
@@ -196,7 +198,6 @@ static const struct uvisor_type uvisor_devs[] = {
 	{{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_NX60 }, PALM4 },
 	{{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25 }, PALM4 },
 /*	{{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_25 }, PALM4 },*/
-	{{ USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_IQUE3600 }, PALM4 },
 	{{ USB_VENDOR_TAPWAVE, USB_PRODUCT_TAPWAVE_ZODIAC }, PALM4 },
 };
 #define uvisor_lookup(v, p) ((struct uvisor_type *)usb_lookup(uvisor_devs, v, p))