diff options
| author | joe <joe@FreeBSD.org> | 2002-01-02 20:16:53 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-01-02 20:16:53 +0000 |
| commit | dc37dfab7839bf806e8b708af3594f4351d24c83 (patch) | |
| tree | 0606c3163a777ae4d4d6ebf432595414516a660e /sys/dev/usb/usb.c | |
| parent | 59ca9f3607038f6a0ace86a98f6ca9a484836e7f (diff) | |
| download | FreeBSD-src-dc37dfab7839bf806e8b708af3594f4351d24c83.zip FreeBSD-src-dc37dfab7839bf806e8b708af3594f4351d24c83.tar.gz | |
Sync usb.h with NetBSD, apart from usb_device_info.speed, which
requires logic changes. For now leave it as usb_device_info.lowspeed.
It will get addressed when the usb.c code is sync'd.
Diffstat (limited to 'sys/dev/usb/usb.c')
| -rw-r--r-- | sys/dev/usb/usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 8bf401b..ef7d909 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -652,10 +652,10 @@ usbd_add_event(type, dev) int s; s = splusb(); - if (type == USB_EVENT_DETACH) { + if (type == USB_EVENT_CTRLR_DETACH) { for (ueq = TAILQ_FIRST(&usb_events); ueq; ueq = ueq_next) { ueq_next = TAILQ_NEXT(ueq, next); - if (ueq->ue.ue_cookie.cookie == dev->cookie.cookie) { + if (ueq->ue.u.ue_driver.ue_cookie.cookie == dev->cookie.cookie) { TAILQ_REMOVE(&usb_events, ueq, next); free(ueq, M_USBDEV); usb_nevents--; @@ -676,8 +676,8 @@ usbd_add_event(type, dev) return; } ueq->ue.ue_type = type; - ueq->ue.ue_cookie = dev->cookie; - usbd_fill_deviceinfo(dev, &ueq->ue.ue_device, 0); + ueq->ue.u.ue_driver.ue_cookie = dev->cookie; + usbd_fill_deviceinfo(dev, &ueq->ue.u.ue_device, 0); microtime(&thetime); TIMEVAL_TO_TIMESPEC(&thetime, &ueq->ue.ue_time); TAILQ_INSERT_TAIL(&usb_events, ueq, next); |
