diff options
author | mickey <mickey@openbsd.org> | 2001-09-17 17:29:56 +0000 |
---|---|---|
committer | mickey <mickey@openbsd.org> | 2001-09-17 17:29:56 +0000 |
commit | fb99babb9de6b1f87c2349150664d6656fd9737e (patch) | |
tree | 55223c285bdc5cc648fb79afbe035c73bd845603 | |
parent | icmpv6 nat fix, from Ryan McBride (diff) | |
download | wireguard-openbsd-fb99babb9de6b1f87c2349150664d6656fd9737e.tar.xz wireguard-openbsd-fb99babb9de6b1f87c2349150664d6656fd9737e.zip |
Add support for -d in usbdevs(8); from Jason Ackley <jason@ackley.net>, pr#2005
-rw-r--r-- | usr.sbin/usbdevs/usbdevs.8 | 13 | ||||
-rw-r--r-- | usr.sbin/usbdevs/usbdevs.c | 19 |
2 files changed, 25 insertions, 7 deletions
diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8 index abf14bfaad4..a9397e35704 100644 --- a/usr.sbin/usbdevs/usbdevs.8 +++ b/usr.sbin/usbdevs/usbdevs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: usbdevs.8,v 1.4 2001/07/20 19:09:49 mpech Exp $ +.\" $OpenBSD: usbdevs.8,v 1.5 2001/09/17 17:29:56 mickey Exp $ .\" $NetBSD: usbdevs.8,v 1.4 1999/04/13 20:50:49 augustss Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 12, 1998 +.Dd August 14, 2001 .Dt USBDEVS 8 .Os .Sh NAME @@ -43,9 +43,9 @@ .Nd show USB devices connected to the system .Sh SYNOPSIS .Nm usbdevs +.Op Fl dv .Op Fl a Ar addr .Op Fl f Ar dev -.Op Fl v .Sh DESCRIPTION .Nm prints a listing of all USB devices connected to the system @@ -56,11 +56,18 @@ The options are as follows: .Bl -tag -width Ds .It Fl a Ar addr Only print information about the device at the given address. +.It Fl d +Show the device drivers associated with each device. .It Fl f Ar dev Only print information for the given USB controller. .It Fl v Be verbose. .El +.Sh FILES +.Bl -tag -width Pa +.It Pa /dev/usb[0-9] +Default USB controllers. +.El .Sh SEE ALSO .Xr usb 4 .Sh HISTORY diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c index a25e7b436a6..41919fdcb76 100644 --- a/usr.sbin/usbdevs/usbdevs.c +++ b/usr.sbin/usbdevs/usbdevs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdevs.c,v 1.1 2000/02/03 21:52:15 jakob Exp $ */ +/* $OpenBSD: usbdevs.c,v 1.2 2001/09/17 17:29:56 mickey Exp $ */ /* $NetBSD: usbdevs.c,v 1.11 1999/09/08 02:39:36 augustss Exp $ */ /* @@ -50,6 +50,7 @@ #define USBDEV "/dev/usb" int verbose; +int showdevs; void usage __P((void)); void usbdev __P((int f, int a, int rec)); @@ -62,7 +63,8 @@ extern char *__progname; void usage() { - fprintf(stderr, "Usage: %s [-a addr] [-f dev] [-v]\n", __progname); + fprintf(stderr, "Usage: %s [-a addr] [-d] [-f dev] [-v]\n", + __progname); exit(1); } @@ -76,7 +78,7 @@ usbdev(f, a, rec) int rec; { struct usb_device_info di; - int e, p; + int e, p, i; di.addr = a; e = ioctl(f, USB_DEVICEINFO, &di); @@ -106,6 +108,12 @@ usbdev(f, a, rec) } else printf("%s, %s", di.product, di.vendor); printf("\n"); + if (showdevs) { + for (i = 0; i< USB_MAX_DEVNAMES; i++) + if (di.devnames[i][0]) + printf("%*s %s\n", indent, "", + di.devnames[i]); + } if (!rec) return; for (p = 0; p < di.nports; p++) { @@ -175,11 +183,14 @@ main(argc, argv) int addr = 0; int ncont; - while ((ch = getopt(argc, argv, "a:f:v")) != -1) { + while ((ch = getopt(argc, argv, "a:df:v?")) != -1) { switch(ch) { case 'a': addr = atoi(optarg); break; + case 'd': + showdevs++; + break; case 'f': dev = optarg; break; |