summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-04-09 16:54:37 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-04-09 16:54:37 +0000
commit9f16015f42e8264b0137831df50d054ba821e459 (patch)
tree489955c21322ac05cbf932add8763b6ce6c7beca /sys
parent166a2e1658bc097fe1406e491200f9b6dac4604d (diff)
support Crystalfontz CF-63[1234] USB LCDs; wpd@xs4all.nl
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/uftdi.c14
-rw-r--r--sys/dev/usb/usbdevs6
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 4128cee5c38..6bfff625e51 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uftdi.c,v 1.14 2003/12/08 15:26:22 henning Exp $ */
+/* $OpenBSD: uftdi.c,v 1.15 2004/04/09 16:54:35 deraadt Exp $ */
/* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */
/*
@@ -138,8 +138,12 @@ 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_LCD_MX200_USB))
- return (UMATCH_VENDOR_PRODUCT);
+ uaa->product == USB_PRODUCT_FTDI_LCD_MX200_USB ||
+ uaa->product == USB_PRODUCT_FTDI_LCD_CFA631_USB ||
+ uaa->product == USB_PRODUCT_FTDI_LCD_CFA632_USB ||
+ uaa->product == USB_PRODUCT_FTDI_LCD_CFA633_USB ||
+ uaa->product == USB_PRODUCT_FTDI_LCD_CFA634_USB))
+ return (UMATCH_VENDOR_PRODUCT);
return (UMATCH_NONE);
}
@@ -192,6 +196,10 @@ USB_ATTACH(uftdi)
case USB_PRODUCT_FTDI_SERIAL_8U232AM:
case USB_PRODUCT_FTDI_LCD_LK202_24_USB:
case USB_PRODUCT_FTDI_LCD_MX200_USB:
+ case USB_PRODUCT_FTDI_LCD_CFA631_USB:
+ case USB_PRODUCT_FTDI_LCD_CFA632_USB:
+ case USB_PRODUCT_FTDI_LCD_CFA633_USB:
+ case USB_PRODUCT_FTDI_LCD_CFA634_USB:
sc->sc_type = UFTDI_TYPE_8U232AM;
sc->sc_hdrlen = 0;
break;
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index c48b7bcdc08..54029f21655 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.77 2004/02/27 17:29:33 henning Exp $
+$OpenBSD: usbdevs,v 1.78 2004/04/09 16:54:35 deraadt Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -720,6 +720,10 @@ product FTDI PS2KBDMS 0x8371 PS/2 Keyboard/Mouse
product FTDI SERIAL_8U100AX 0x8372 Serial converter
product FTDI LCD_MX200_USB 0xfa01 Matrix Orbital MX200 Series LCD
product FTDI LCD_LK202_24_USB 0xfa03 Matrix Orbital LK202-24 USB LCD
+product FTDI LCD_CFA631_USB 0xfc0c Crystalfontz CFA-631 USB LCD
+product FTDI LCD_CFA632_USB 0xfc08 Crystalfontz CFA-632 USB LCD
+product FTDI LCD_CFA633_USB 0xfc0b Crystalfontz CFA-633 USB LCD
+product FTDI LCD_CFA634_USB 0xfc09 Crystalfontz CFA-634 USB LCD
/* Fuji photo products */
product FUJIPHOTO MASS0100 0x0100 Mass Storage