diff options
| author |   deraadt <deraadt@openbsd.org> | 2007-10-11 18:33:13 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2007-10-11 18:33:13 +0000 |
| commit | fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6 (patch) | |
| tree | f48ba3f4f889ca73be80167ebfdbf26cc87597d9 /sys/dev/usb/uhidev.c | |
| parent | serialize usbd_probe_and_attach(); only let one usb device be match'd and (diff) | |
| download | wireguard-openbsd-fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6.tar.xz wireguard-openbsd-fc5c6ac59ce5cbc022c1e83b8d45d511803eefc6.zip | |
treat usb vendor/product names as a locator, and have usbd_print handle it,
so that it shows up before the :. as a result, all the usb devices do not
need to have name printing code anymore. all this now works and prints
nicely because usbd_probe_and_attach() is serialized. ok kettenis
Diffstat (limited to 'sys/dev/usb/uhidev.c')
| -rw-r--r-- | sys/dev/usb/uhidev.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index f54f11d045e..6ee1573ae4e 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.c,v 1.29 2007/09/11 13:39:34 gilles Exp $ */ +/* $OpenBSD: uhidev.c,v 1.30 2007/10/11 18:33:15 deraadt Exp $ */ /* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -144,16 +144,13 @@ uhidev_attach(struct device *parent, struct device *self, void *aux) void *desc; const void *descptr; usbd_status err; - char *devinfop; sc->sc_udev = uaa->device; sc->sc_iface = iface; id = usbd_get_interface_descriptor(iface); - devinfop = usbd_devinfo_alloc(uaa->device, 0); - printf("\n%s: %s, iclass %d/%d\n", sc->sc_dev.dv_xname, - devinfop, id->bInterfaceClass, id->bInterfaceSubClass); - usbd_devinfo_free(devinfop); + printf("%s: iclass %d/%d\n", sc->sc_dev.dv_xname, + id->bInterfaceClass, id->bInterfaceSubClass); (void)usbd_set_idle(iface, 0, 0); #if 0 |