summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2007-01-30 01:22:53 +0000
committerjsg <jsg@openbsd.org>2007-01-30 01:22:53 +0000
commit84e5d35dd31b860b4c81272c33b628a5af54fd6d (patch)
treeb8322665a58ec870c0ad5cf2308def4f4d653cd7
parentregen (diff)
downloadwireguard-openbsd-84e5d35dd31b860b4c81272c33b628a5af54fd6d.tar.xz
wireguard-openbsd-84e5d35dd31b860b4c81272c33b628a5af54fd6d.zip
Add some umsm devices found in Linux driver.
"looks good" fkr@
-rw-r--r--share/man/man4/umsm.422
-rw-r--r--sys/dev/usb/umsm.c14
2 files changed, 29 insertions, 7 deletions
diff --git a/share/man/man4/umsm.4 b/share/man/man4/umsm.4
index 5cd31f53e63..86782de3e88 100644
--- a/share/man/man4/umsm.4
+++ b/share/man/man4/umsm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: umsm.4,v 1.11 2007/01/13 20:25:56 fkr Exp $
+.\" $OpenBSD: umsm.4,v 1.12 2007/01/30 01:22:53 jsg Exp $
.\"
.\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
.\"
@@ -37,8 +37,8 @@ driver:
.Pp
.Bl -column "Device " "Bus" -compact -offset 6n
.It Em "Device Bus"
-.It Li "AirPrime PC5220" Ta Cardbus
-.It Li "Kyocera KPC650" Ta Cardbus
+.It Li "AirPrime PC5220" Ta CardBus
+.It Li "Kyocera KPC650" Ta CardBus
.It Li "Sierra Wireless MC8755" Ta PCI Express Mini Card
.El
.Pp
@@ -46,9 +46,19 @@ Devices suspected of being compatible are:
.Pp
.Bl -column "Device " "Bus" -compact -offset 6n
.It Em "Device Bus"
-.It Li "Novatel Wireless Merlin V620" Ta Cardbus
-.It Li "Sierra Wireless AirCard 580" Ta Cardbus
-.It Li "Sierra Wireless AirCard 875" Ta Cardbus
+.It Li "Dell W5500" Ta PCI Express Mini Card
+.It Li "Novatel Wireless Merlin V620" Ta CardBus
+.It Li "Novatel Wireless S720" Ta CardBus
+.It Li "Novatel Wireless U720" Ta USB
+.It Li "Novatel Wireless XU870 HSDPA" Ta ExpressCard
+.It Li "Sierra Wireless AirCard 580" Ta CardBus
+.It Li "Sierra Wireless AirCard 595" Ta CardBus
+.It Li "Sierra Wireless AirCard 875" Ta CardBus
+.It Li "Sierra Wireless EM5625" Ta USB module
+.It Li "Sierra Wireless MC5720" Ta PCI Express Mini Card
+.It Li "Sierra Wireless MC5725" Ta PCI Express Mini Card
+.It Li "Sierra Wireless MC8765" Ta PCI Express Mini Card
+.It Li "Sierra Wireless MC8775" Ta PCI Express Mini Card
.El
.Sh EXAMPLES
An example
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 5778c9fec3f..38b70834641 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umsm.c,v 1.5 2007/01/13 19:54:21 stevesk Exp $ */
+/* $OpenBSD: umsm.c,v 1.6 2007/01/30 01:22:53 jsg Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -56,11 +56,23 @@ struct ucom_methods umsm_methods = {
static const struct usb_devno umsm_devs[] = {
{ USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220 },
+ { USB_VENDOR_DELL, USB_PRODUCT_DELL_W5500 },
{ USB_VENDOR_KYOCERA2, USB_PRODUCT_KYOCERA2_KPC650 },
+ { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_EXPRESSCARD },
{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINV620 },
+ { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_S720 },
+ { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720 },
+ { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625 },
{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD_580 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD_595 },
{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD_875 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725 },
{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765 },
+ { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775 },
};
USB_DECLARE_DRIVER(umsm);