From: deraadt <deraadt@openbsd.org>
Date: Tue, 7 Jan 2014 14:00:50 +0000 (+0000)
Subject: FTX support; from Chris Hettrick
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=36d303ac06d5e96c31e66df2e227976e15403a7f;p=openbsd

FTX support; from Chris Hettrick
---

diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index e2901bac18a..823d555d0d9 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.68 2013/12/13 12:32:24 yuo Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.69 2014/01/07 14:00:50 deraadt Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -247,6 +247,7 @@ static const struct usb_devno uftdi_devs[] = {
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_5 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT232_6 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FT4232H },
+	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FTX },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GAMMASCOUT },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_1 },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_GUDE_2 },
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index d72c20f9916..4744879391d 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.618 2013/12/17 12:51:14 deraadt Exp $
+$OpenBSD: usbdevs,v 1.619 2014/01/07 14:00:51 deraadt Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -1692,6 +1692,7 @@ product FTDI FT232_5		0x6008	Serial
 product FTDI FT232_6		0x6009	Serial
 product FTDI SERIAL_2232C	0x6010	2232C Serial
 product FTDI FT4232H		0x6011	FT4232H
+product FTDI FTX		0x6015	FTX
 product FTDI PS2KBDMS		0x8371	PS/2 Keyboard/Mouse
 product FTDI SERIAL_8U100AX	0x8372	Serial
 product FTDI MJS_SIRIUS_PC_2	0x9379	MJS Sirius To PC Interface