summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-01-07 14:00:55 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-01-07 14:00:55 +0000
commitde0d6cacd77858b99e330544948e26e111db5dd2 (patch)
tree0ec842e207eb07ce2633f4c440f30edf7348da17
parentb9a6dbe8e793fdec9141c19d699c7058d82668da (diff)
sync
-rw-r--r--sys/dev/usb/usbdevs.h5
-rw-r--r--sys/dev/usb/usbdevs_data.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index f42aadc2c49..c8448a476a6 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.629 2013/12/17 12:51:18 deraadt Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.630 2014/01/07 14:00:54 deraadt Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * 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 $ */
@@ -1699,6 +1699,7 @@
#define USB_PRODUCT_FTDI_FT232_6 0x6009 /* Serial */
#define USB_PRODUCT_FTDI_SERIAL_2232C 0x6010 /* 2232C Serial */
#define USB_PRODUCT_FTDI_FT4232H 0x6011 /* FT4232H */
+#define USB_PRODUCT_FTDI_FTX 0x6015 /* FTX */
#define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */
#define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* Serial */
#define USB_PRODUCT_FTDI_MJS_SIRIUS_PC_2 0x9379 /* MJS Sirius To PC Interface */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index c6ada784a3d..c8875c1bad1 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.623 2013/12/17 12:51:18 deraadt Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.624 2014/01/07 14:00:54 deraadt Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * 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 $ */
@@ -2990,6 +2990,10 @@ const struct usb_known_product usb_known_products[] = {
"FT4232H",
},
{
+ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_FTX,
+ "FTX",
+ },
+ {
USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
"PS/2 Keyboard/Mouse",
},