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

6 files changed, 39 insertions, 11 deletions

diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index bae25ccd7a9..fe26effdd9c 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -29,9 +29,9 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/axe.4,v 1.3 2003/05/29 21:28:35 ru Exp $
-.\" $OpenBSD: axe.4,v 1.33 2007/05/31 19:19:49 jmc Exp $
+.\" $OpenBSD: axe.4,v 1.34 2008/02/22 12:42:41 jsg Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: February 22 2008 $
 .Dt AXE 4
 .Os
 .Sh NAME
@@ -63,6 +63,7 @@ following:
 .It Level One USB-0200
 .It Linksys USB200M
 .It Linksys USB1000
+.It Logitec LAN-GTJ/U2
 .It Netgear FA120
 .It Nintendo Wii USB Lan Ethernet Adapter RVL-015
 .It OQO model 01+ Ethernet
diff --git a/share/man/man4/uftdi.4 b/share/man/man4/uftdi.4
index ae5a39f1d6c..2ccf6a351ea 100644
--- a/share/man/man4/uftdi.4
+++ b/share/man/man4/uftdi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uftdi.4,v 1.23 2007/11/11 02:14:24 deraadt Exp $
+.\" $OpenBSD: uftdi.4,v 1.24 2008/02/22 12:42:41 jsg Exp $
 .\" $NetBSD: uftdi.4,v 1.3 2001/01/13 20:53:22 nathanw Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 11 2007 $
+.Dd $Mdocdate: February 22 2008 $
 .Dt UFTDI 4
 .Os
 .Sh NAME
@@ -70,6 +70,8 @@ driver supports the following adapters:
 .It Tn Crystalfontz CFA-634 USB LCD
 .It Tn Crystalfontz CFA-635 USB LCD
 .It Tn D-Link DSB-H4SMK
+.It Tn Expert ISDN Control
+.It Tn Expert OptoBridge
 .It Tn Falcom Twist/Samba USB GSM/GPRS modem
 .It Tn I-O DATA USBGPS2
 .It Tn Inland UAS111
@@ -84,9 +86,13 @@ driver supports the following adapters:
 .It Tn microHAM USB Interface II
 .It Tn MJS Sirius To PC Interface
 .It Tn QVS USC-1000
+.It Tn RATOC REX-USB60F
 .It Tn Sealevel USB-Serial
 .It Tn SEMC DSS-20 SyncStation
 .It Tn SIIG US2308
+.It Tn Tactrix OpenPort 1.3 Mitsubishi
+.It Tn Tactrix OpenPort 1.3 Subaru
+.It Tn Tactrix OpenPort 1.3 Universal
 .El
 .Sh SEE ALSO
 .Xr intro 4 ,
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/usbdevs b/sys/dev/usb/usbdevs
index 1a5ea8623bc..683482c25e2 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.335 2008/02/22 10:45:15 jsg Exp $
+$OpenBSD: usbdevs,v 1.336 2008/02/22 12:37:59 jsg Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -418,6 +418,7 @@ vendor SITECOMEU	0x0df6	Sitecom Europe
 vendor MOBILEACTION	0x0df7	Mobile Action
 vendor SPEEDDRAGON	0x0e55	Speed Dragon Multimedia
 vendor HAWKING		0x0e66	Hawking
+vendor FOSSIL		0x0e67	Fossil
 vendor GMATE		0x0e7e	G.Mate
 vendor OTI		0x0ea0	Ours Technology
 vendor PILOTECH		0x0eaf  Pilotech
@@ -1179,6 +1180,9 @@ product FALCOM SAMBA		0x0005	Falcom Samba USB
 /* Fiberline */
 product FIBERLINE WL430U	0x6003	WL-430U
 
+/* Fossil products */
+product FOSSIL WRISTPDA		0x0002	Wrist PDA
+
 /* Freecom products */
 product FREECOM DVD		0xfc01	Connector for DVD drive
 
@@ -1189,6 +1193,11 @@ product FTDI SERIAL_2232L	0xcff8	2232L Serial
 product FTDI PS2KBDMS		0x8371	PS/2 Keyboard/Mouse
 product FTDI SERIAL_8U100AX	0x8372	Serial
 product FTDI MJS_SIRIUS_PC	0xca81	MJS Sirius To PC Interface
+product FTDI OPENPORT_13M	0xcc48	OpenPort 1.3 Mitsubishi
+product FTDI OPENPORT_13S	0xcc49	OpenPort 1.3 Subaru
+product FTDI OPENPORT_13U	0xcc4a	OpenPort 1.3 Universal
+product FTDI EISCOU		0xe888	Expert ISDN
+product FTDI UOPTBR		0xe889	RS232 OptoBridge
 product FTDI DCF		0xe88a	Expert mouseCLOCK USB II
 product FTDI MSF		0xe88b	Expert mouseCLOCK USB II MSF
 product FTDI HBG		0xe88c	Expert mouseCLOCK USB II HBG
@@ -1579,6 +1588,7 @@ product LINKSYS3 WUSB11V30	0x2236	WUSB11 v3.0
 product LINKSYS USB10TX2	0x400b	USB10TX
 
 /* Logitec products */
+product LOGITEC LAN_GTJU2	0x0102	LAN-GTJ/U2
 product LOGITEC	LANTX		0x0105	LAN-TX
 
 /* Logitech products */
@@ -2034,6 +2044,7 @@ product RALINK RT2870		0x2870	RT2870
 
 /* RATOC Systems products */
 product RATOC REXUSB60		0xb000	USB serial REX-USB60
+product RATOC REXUSB60F		0xb020	REX-USB60F
 
 /* Realtek products */
 product REALTEK RTL8150		0x8150	RTL8150
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))