diff options
| author |   mpi <mpi@openbsd.org> | 2014-08-09 09:45:14 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2014-08-09 09:45:14 +0000 |
| commit | eff17a6a55d0fce39da7e589cb0eb3147404c33e (patch) | |
| tree | dd504bb83d1535c5fffbed33b83bc3c9a90232a4 /sys/dev/usb/usb.c | |
| parent | some minor tweaks; (diff) | |
| download | wireguard-openbsd-eff17a6a55d0fce39da7e589cb0eb3147404c33e.tar.xz wireguard-openbsd-eff17a6a55d0fce39da7e589cb0eb3147404c33e.zip | |
Do not store the whole USB hub descriptor in the "struct usbd_hub"
to help integrating super speed hubs that use a different descriptor.
Diffstat (limited to 'sys/dev/usb/usb.c')
| -rw-r--r-- | sys/dev/usb/usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 7a1b3ae2b96..5cd6b3cff37 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.100 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: usb.c,v 1.101 2014/08/09 09:45:14 mpi Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -835,8 +835,8 @@ usb_explore(void *v) timersub(&now, &sc->sc_ptime, &waited); waited_ms = waited.tv_sec * 1000 + waited.tv_usec / 1000; - pwrdly = sc->sc_bus->root_hub->hub->hubdesc.bPwrOn2PwrGood * - UHD_PWRON_FACTOR + USB_EXTRA_POWER_UP_TIME; + pwrdly = sc->sc_bus->root_hub->hub->powerdelay + + USB_EXTRA_POWER_UP_TIME; if (pwrdly > waited_ms) usb_delay_ms(sc->sc_bus, pwrdly - waited_ms); } |