diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-11 18:33:16 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-11 18:33:16 +0000 |
| commit | c8d027b7c2c9478cc6134a64ce7f4493c4f31d03 (patch) | |
| tree | d059b171ccae4a9b91e72ce31662e4163fb1e943 /sys/dev/usb/ulpt.c | |
| parent | cb538c3cbe26e67bac2b85c75da7259a005d264e (diff) | |
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/ulpt.c')
| -rw-r--r-- | sys/dev/usb/ulpt.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 892b6b34198..f84cc5e98ed 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ulpt.c,v 1.32 2007/06/14 10:11:16 mbalmer Exp $ */ +/* $OpenBSD: ulpt.c,v 1.33 2007/10/11 18:33:15 deraadt Exp $ */ /* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ @@ -176,17 +176,14 @@ ulpt_attach(struct device *parent, struct device *self, void *aux) usb_interface_descriptor_t *id, *iend; usb_config_descriptor_t *cdesc; usbd_status err; - char *devinfop; usb_endpoint_descriptor_t *ed; u_int8_t epcount; int i, altno; DPRINTFN(10,("ulpt_attach: sc=%p\n", sc)); - devinfop = usbd_devinfo_alloc(dev, 0); - printf("\n%s: %s, iclass %d/%d\n", sc->sc_dev.dv_xname, - devinfop, ifcd->bInterfaceClass, ifcd->bInterfaceSubClass); - usbd_devinfo_free(devinfop); + //printf("%s: iclass %d/%d\n", sc->sc_dev.dv_xname, + // ifcd->bInterfaceClass, ifcd->bInterfaceSubClass); /* XXX * Stepping through the alternate settings needs to be abstracted out. |