diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-03 12:40:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-03-03 12:40:33 +0000 |
| commit | d15afdd0e4f034b2e62e55c570569d0cd69cee29 (patch) | |
| tree | 86a39e8a99e248f7ac8307257b51b26d1b434075 | |
| parent | dc779fa437a559de7417c6ea1f86bb1311bf5485 (diff) | |
Sirius To PC Interface is a uftdi; marco@azbsd.org
| -rw-r--r-- | share/man/man4/uftdi.4 | 3 | ||||
| -rw-r--r-- | sys/dev/usb/uftdi.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/share/man/man4/uftdi.4 b/share/man/man4/uftdi.4 index d0ff11d79ff..2bade3f3f7c 100644 --- a/share/man/man4/uftdi.4 +++ b/share/man/man4/uftdi.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: uftdi.4,v 1.19 2007/02/08 09:16:29 jmc Exp $ +.\" $OpenBSD: uftdi.4,v 1.20 2007/03/03 12:40:32 deraadt Exp $ .\" $NetBSD: uftdi.4,v 1.3 2001/01/13 20:53:22 nathanw Exp $ .\" .\" Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -80,6 +80,7 @@ driver supports the following adapters: .It Tn microHAM USB microKEYER .It Tn microHAM USB CW Keyer .It Tn microHAM USB Interface II +.It Tn MJS Sirius To PC Interface .It Tn QVS USC-1000 .It Tn Sealevel USB-Serial .It Tn SEMC DSS-20 SyncStation diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index 9eff246d04f..bd2a2ca3abd 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uftdi.c,v 1.32 2007/02/07 23:51:51 jsg Exp $ */ +/* $OpenBSD: uftdi.c,v 1.33 2007/03/03 12:40:31 deraadt Exp $ */ /* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */ /* @@ -160,8 +160,9 @@ USB_MATCH(uftdi) uaa->product == USB_PRODUCT_FTDI_LCD_CFA_631 || uaa->product == USB_PRODUCT_FTDI_LCD_CFA_632 || uaa->product == USB_PRODUCT_FTDI_LCD_CFA_633 || - uaa->product == USB_PRODUCT_FTDI_LCD_CFA_634)) - return (UMATCH_VENDOR_PRODUCT); + uaa->product == USB_PRODUCT_FTDI_LCD_CFA_634 || + uaa->product == USB_PRODUCT_FTDI_MJS_SIRIUS_PC)) + return (UMATCH_VENDOR_PRODUCT); if (uaa->vendor == USB_VENDOR_SIIG2 && (uaa->product == USB_PRODUCT_SIIG2_US2308)) return (UMATCH_VENDOR_PRODUCT); @@ -255,6 +256,7 @@ USB_ATTACH(uftdi) case USB_PRODUCT_FTDI_MHAM_RS232: case USB_PRODUCT_FTDI_MHAM_Y9: case USB_PRODUCT_SEALEVEL_USBSERIAL: + case USB_PRODUCT_FTDI_MJS_SIRIUS_PC: sc->sc_type = UFTDI_TYPE_8U232AM; sc->sc_hdrlen = 0; break; diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 35a713d6e8c..1d8d8098c16 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$OpenBSD: usbdevs,v 1.267 2007/02/28 04:11:38 deraadt Exp $ +$OpenBSD: usbdevs,v 1.268 2007/03/03 12:40:31 deraadt Exp $ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* @@ -1122,6 +1122,7 @@ product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial product FTDI SERIAL_2232C 0x6010 2232C 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 SERIAL_232BM 0xee18 FT232BM Serial product FTDI MHAM_KW 0xeee8 KW product FTDI MHAM_YS 0xeee9 YS |