summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uftdi.c17
-rw-r--r--sys/dev/usb/usbdevs6
2 files changed, 21 insertions, 2 deletions
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 78f6567815a..d0fe7fc7c65 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uftdi.c,v 1.17 2004/08/13 22:13:55 deraadt Exp $ */
+/* $OpenBSD: uftdi.c,v 1.18 2004/10/30 14:36:28 deraadt Exp $ */
/* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */
/*
@@ -154,6 +154,9 @@ USB_MATCH(uftdi)
(uaa->product == USB_PRODUCT_INTREPIDCS_VALUECAN ||
uaa->product == USB_PRODUCT_INTREPIDCS_NEOVI))
return (UMATCH_VENDOR_PRODUCT);
+ if (uaa->vendor == USB_VENDOR_BBELECTRONICS &&
+ (uaa->product == USB_PRODUCT_BBELECTRONICS_USOTL4))
+ return (UMATCH_VENDOR_PRODUCT);
return (UMATCH_NONE);
}
@@ -242,6 +245,18 @@ USB_ATTACH(uftdi)
sc->sc_type = UFTDI_TYPE_8U232AM;
sc->sc_hdrlen = 0;
break;
+
+ default: /* Can't happen */
+ goto bad;
+ }
+ break;
+
+ case USB_VENDOR_BBELECTRONICS:
+ switch( uaa->product ){
+ case USB_PRODUCT_BBELECTRONICS_USOTL4:
+ sc->sc_type = UFTDI_TYPE_8U232AM;
+ sc->sc_hdrlen = 0;
+ break;
default: /* Can't happen */
goto bad;
}
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 39b133a4595..397d32ce84a 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.117 2004/10/26 00:25:51 jsg Exp $
+$OpenBSD: usbdevs,v 1.118 2004/10/30 14:36:28 deraadt Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -290,6 +290,7 @@ vendor ACCTON 0x083a Accton Technology
vendor DIAMOND 0x0841 Diamond
vendor NETGEAR 0x0846 BayNETGEAR
vendor ACTIVEWIRE 0x0854 ActiveWire
+vendor BBELECTRONICS 0x0856 B&B Electronics
vendor PORTGEAR 0x085a PortGear
vendor NETGEAR2 0x0864 Netgear
vendor SYSTEMTALKS 0x086e System Talks
@@ -563,6 +564,9 @@ product AVERATEC USBWLAN 0x4013 WLAN
/* Avision products */
product AVISION 1200U 0x0268 1200U
+/* B&B Electronics products */
+product BBELECTRONICS USOTL4 0xAC01 uLinks RS-422/485
+
/* Belkin products */
/*product BELKIN F5U111 0x???? F5U111 Ethernet */
product BELKIN2 F5U002 0x0002 F5U002 Parallel