summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/man/man4/uftdi.43
-rw-r--r--sys/dev/usb/uftdi.c4
-rw-r--r--sys/dev/usb/usbdevs7
3 files changed, 9 insertions, 5 deletions
diff --git a/share/man/man4/uftdi.4 b/share/man/man4/uftdi.4
index 9d93c56e6bd..d8b6865365e 100644
--- a/share/man/man4/uftdi.4
+++ b/share/man/man4/uftdi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uftdi.4,v 1.10 2004/12/08 02:47:30 jsg Exp $
+.\" $OpenBSD: uftdi.4,v 1.11 2005/04/01 08:25:39 deraadt Exp $
.\" $NetBSD: uftdi.4,v 1.3 2001/01/13 20:53:22 nathanw Exp $
.\"
.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -67,6 +67,7 @@ driver supports the following adapters:
.It Tn QVS USC-1000
.It Tn SIIG US2308
.It Tn 8U232AM Serial converter
+.It Tn 2232C (Dual) Serial converter
.It Tn Matrix Orbital LK202-24 USB LCD
.It Tn Matrix Orbital LK204-24 USB LCD
.It Tn Matrix Orbital MX200 Series LCD
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 9f645b2790d..2c97daac49b 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uftdi.c,v 1.19 2004/12/08 02:47:30 jsg Exp $ */
+/* $OpenBSD: uftdi.c,v 1.20 2005/04/01 08:25:39 deraadt Exp $ */
/* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */
/*
@@ -138,6 +138,7 @@ USB_MATCH(uftdi)
if (uaa->vendor == USB_VENDOR_FTDI &&
(uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX ||
uaa->product == USB_PRODUCT_FTDI_SERIAL_8U232AM ||
+ uaa->product == USB_PRODUCT_FTDI_SERIAL_2232C ||
uaa->product == USB_PRODUCT_FTDI_SEMC_DSS20 ||
uaa->product == USB_PRODUCT_FTDI_LCD_LK202_24 ||
uaa->product == USB_PRODUCT_FTDI_LCD_LK204_24 ||
@@ -213,6 +214,7 @@ USB_ATTACH(uftdi)
case USB_PRODUCT_FTDI_SEMC_DSS20:
case USB_PRODUCT_FTDI_SERIAL_8U232AM:
+ case USB_PRODUCT_FTDI_SERIAL_2232C:
case USB_PRODUCT_FTDI_LCD_LK202_24:
case USB_PRODUCT_FTDI_LCD_LK204_24:
case USB_PRODUCT_FTDI_LCD_MX200:
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 28174e586d4..5490e259cda 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.147 2005/03/25 18:09:15 mickey Exp $
+$OpenBSD: usbdevs,v 1.148 2005/04/01 08:25:39 deraadt Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -880,9 +880,10 @@ product FALCOM TWIST 0x0001 Falcom Twist USB
product FREECOM DVD 0xfc01 Connector for DVD drive
/* Future Technology Devices products */
-product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial converter
+product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial
+product FDTI SERIAL_2232C 0x6010 2232C Serial
product FTDI PS2KBDMS 0x8371 PS/2 Keyboard/Mouse
-product FTDI SERIAL_8U100AX 0x8372 Serial converter
+product FTDI SERIAL_8U100AX 0x8372 Serial
product FTDI LCD_MX200 0xfa01 Matrix Orbital MX200 Series LCD
product FTDI LCD_LK202_24 0xfa03 Matrix Orbital LK202-24 LCD
product FTDI LCD_LK204_24 0xfa04 Matrix Orbital LK204-24 LCD