summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/uftdi.c6
-rw-r--r--sys/dev/usb/usbdevs3
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index fa18900d6b4..2ec7c124e29 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uftdi.c,v 1.25 2005/08/01 05:36:48 brad Exp $ */
+/* $OpenBSD: uftdi.c,v 1.26 2006/03/26 18:57:00 grange Exp $ */
/* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */
/*
@@ -162,7 +162,8 @@ USB_MATCH(uftdi)
(uaa->product == USB_PRODUCT_BBELECTRONICS_USOTL4))
return (UMATCH_VENDOR_PRODUCT);
if (uaa->vendor == USB_VENDOR_FALCOM &&
- (uaa->product == USB_PRODUCT_FALCOM_TWIST))
+ (uaa->product == USB_PRODUCT_FALCOM_TWIST ||
+ uaa->product == USB_PRODUCT_FALCOM_SAMBA))
return (UMATCH_VENDOR_PRODUCT);
if (uaa->vendor == USB_VENDOR_SEALEVEL &&
uaa->product == USB_PRODUCT_SEALEVEL_USBSERIAL)
@@ -281,6 +282,7 @@ USB_ATTACH(uftdi)
case USB_VENDOR_FALCOM:
switch( uaa->product ){
case USB_PRODUCT_FALCOM_TWIST:
+ case USB_PRODUCT_FALCOM_SAMBA:
sc->sc_type = UFTDI_TYPE_8U232AM;
sc->sc_hdrlen = 0;
break;
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index f5b1a2b8a45..2b20a3ea5a8 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.188 2006/03/24 08:37:23 dlg Exp $
+$OpenBSD: usbdevs,v 1.189 2006/03/26 18:57:00 grange Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -932,6 +932,7 @@ product EXTENDED XTNDACCESS 0x0100 XTNDAccess IrDA
/* Falcom Wireless Communications GmbH products */
product FALCOM TWIST 0x0001 Falcom Twist USB
+product FALCOM SAMBA 0x0005 Falcom Samba USB
/* Freecom products */
product FREECOM DVD 0xfc01 Connector for DVD drive