diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 1999-04-11 14:24:43 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 1999-04-11 14:24:43 +0000 |
| commit | 39dac26a0a9af23f46247ecd9473cf9408cabcf1 (patch) | |
| tree | 08fa65f66a54b773e6665e28122ac06d4e47e1bc /sys/dev | |
| parent | 60e587adbf6cb4331239ca869243579660028500 (diff) | |
| download | FreeBSD-src-39dac26a0a9af23f46247ecd9473cf9408cabcf1.zip FreeBSD-src-39dac26a0a9af23f46247ecd9473cf9408cabcf1.tar.gz | |
Reenable the recursive disconnection from a hub. Stop gap solution
until the newbus version of uhub.c is ready.
Submitted by: Kazutaka YOKOTA
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/uhub.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 7913976..cae5fdb 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhub.c,v 1.14 1999/01/08 11:58:25 augustss Exp $ */ +/* $NetBSD: uhub.c,v 1.16 1999/01/10 19:13:15 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -38,6 +38,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +/* + * USB spec: http://www.usb.org/cgi-usb/mailmerge.cgi/home/usb/docs/developers/cgiform.tpl + */ + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -57,8 +61,8 @@ #include <dev/usb/usbdivar.h> #ifdef USB_DEBUG -#define DPRINTF(x) if (usbdebug) printf x -#define DPRINTFN(n,x) if (usbdebug>(n)) printf x +#define DPRINTF(x) if (usbdebug) logprintf x +#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x extern int usbdebug; extern char *usbd_error_strs[]; #else @@ -340,8 +344,7 @@ uhub_explore(dev) up = &dev->hub->ports[port-1]; r = usbd_get_port_status(dev, port, &up->status); if (r != USBD_NORMAL_COMPLETION) { - DPRINTF(("uhub_explore: get port status failed, on port %d " - "error=%d(%s)\n", + DPRINTF(("uhub_explore: get port %d status failed error=%d(%s)\n", port, r, usbd_error_strs[r])); continue; } @@ -480,7 +483,6 @@ uhub_disconnect_port(up) } /* Remove the device */ -#if defined(__NetBSD__) for (i = 0; i < dev->cdesc->bNumInterface; i++) { for (p = LIST_FIRST(&dev->ifaces[i].pipes); p; p = n) { n = LIST_NEXT(p, next); @@ -502,7 +504,7 @@ uhub_disconnect_port(up) uhub_disconnect_port(rup); } } -#elif defined(__FreeBSD__) +#if defined(__FreeBSD__) device_delete_child(scp->sc_dev, sc->sc_dev); #endif |
