diff options
Diffstat (limited to 'sys/dev/usb/uhub.c')
| -rw-r--r-- | sys/dev/usb/uhub.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index cfec381f835..0b9a9bfa72e 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.43 2007/06/06 19:25:49 mk Exp $ */ +/* $OpenBSD: uhub.c,v 1.44 2007/06/10 10:53:48 mbalmer Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -238,7 +238,7 @@ uhub_attach(struct device *parent, struct device *self, void *aux) /* Wait with power off for a while. */ usbd_delay_ms(dev, USB_POWER_DOWN_TIME); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, &sc->sc_dev); /* * To have the best chance of success we do things in the exact same @@ -413,7 +413,7 @@ uhub_explore(usbd_device_handle dev) /* Disconnected */ DPRINTF(("uhub_explore: device addr=%d disappeared " "on port %d\n", up->device->address, port)); - usb_disconnect_port(up, USBDEV(sc->sc_dev)); + usb_disconnect_port(up, &sc->sc_dev); usbd_clear_port_feature(dev, port, UHF_C_PORT_CONNECTION); } @@ -465,7 +465,7 @@ uhub_explore(usbd_device_handle dev) else speed = USB_SPEED_FULL; /* Get device info and set its address. */ - err = usbd_new_device(USBDEV(sc->sc_dev), dev->bus, + err = usbd_new_device(&sc->sc_dev, dev->bus, dev->depth + 1, speed, port, up); /* XXX retry a few times? */ if (err) { @@ -549,7 +549,7 @@ uhub_detach(struct device *self, int flags) } usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_hub, - USBDEV(sc->sc_dev)); + &sc->sc_dev); if (hub->ports[0].tt) free(hub->ports[0].tt, M_USBDEV); |