summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2016-03-31 12:41:46 +0000
committerreyk <reyk@openbsd.org>2016-03-31 12:41:46 +0000
commit507417db8ae797d931638b5242190cbbf9c5e36f (patch)
treeca9d95d6e5b53b73b40df4566311638a6a4679c1
parentsync (diff)
downloadwireguard-openbsd-507417db8ae797d931638b5242190cbbf9c5e36f.tar.xz
wireguard-openbsd-507417db8ae797d931638b5242190cbbf9c5e36f.zip
The USB console port on Aruba 7xxx wireless controllers shows up as
"Aruba Networks USB to UART Bridge Controller". It uses a Silabs CP210x chip with a modified vendor Id that is supported by uslcom(4). OK jsg@
-rw-r--r--share/man/man4/uslcom.45
-rw-r--r--sys/dev/usb/uslcom.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/share/man/man4/uslcom.4 b/share/man/man4/uslcom.4
index 9b1561f582e..d7e1243c191 100644
--- a/share/man/man4/uslcom.4
+++ b/share/man/man4/uslcom.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uslcom.4,v 1.11 2013/07/16 16:05:49 schwarze Exp $
+.\" $OpenBSD: uslcom.4,v 1.12 2016/03/31 12:41:46 reyk Exp $
.\"
.\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: March 31 2016 $
.Dt USLCOM 4
.Os
.Sh NAME
@@ -35,6 +35,7 @@ driver:
.Bd -literal -offset indent
Aerocomm Radio
Argussoft ISP
+Aruba Networks USB-to-UART
Baltech card reader
Burnside Telecom Desktop Mobile
chip45.com Crumb128 module
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index b3fca7c6afa..ec1e02f200f 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uslcom.c,v 1.37 2016/01/07 12:53:37 mpi Exp $ */
+/* $OpenBSD: uslcom.c,v 1.38 2016/03/31 12:41:46 reyk Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -113,6 +113,7 @@ struct ucom_methods uslcom_methods = {
};
static const struct usb_devno uslcom_devs[] = {
+ { USB_VENDOR_ARUBA, USB_PRODUCT_ARUBA_CP210X },
{ USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER },
{ USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5000CT2 },
{ USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5500PACA },