d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved timeout initialisation a bit earlier in the process. The

Browse Source 
untimeout function triggered panics once in a while.
This commit is contained in:
n_hibma 1999-03-22 19:52:28 +00:00
parent 9f96d3d9ea
commit 2988bfb936
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/usb/uhci.c
View File

@ -548,6 +548,9 @@ uhci_alloc_intr_info(sc)
ii = malloc(sizeof(uhci_intr_info_t), M_USBDEV, M_NOWAIT); ii = malloc(sizeof(uhci_intr_info_t), M_USBDEV, M_NOWAIT);
} }
ii->sc = sc; ii->sc = sc;
#if defined(__FreeBSD__)
callout_handle_init(&ii->timeout_handle);
#endif
return ii; return ii;
} }
@ -1239,6 +1242,9 @@ uhci_device_bulk_start(reqh)
ii->reqh = reqh; ii->reqh = reqh;
ii->stdstart = xfer; ii->stdstart = xfer;
ii->stdend = xferend; ii->stdend = xferend;
#if defined(__FreeBSD__)
callout_handle_init(&ii->timeout_handle);
#endif
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
ii->isdone = 0; ii->isdone = 0;
#endif #endif
@ -1254,10 +1260,6 @@ uhci_device_bulk_start(reqh)
if (reqh->timeout && !sc->sc_bus.use_polling) { if (reqh->timeout && !sc->sc_bus.use_polling) {
usb_timeout(uhci_timeout, ii, usb_timeout(uhci_timeout, ii,
MS_TO_TICKS(reqh->timeout), ii->timeout_handle); MS_TO_TICKS(reqh->timeout), ii->timeout_handle);
#if defined(__FreeBSD__)
} else {
callout_handle_init(&ii->timeout_handle);
#endif
} }
splx(s); splx(s);
@ -1594,6 +1596,9 @@ uhci_device_request(reqh)
ii->reqh = reqh; ii->reqh = reqh;
ii->stdstart = setup; ii->stdstart = setup;
ii->stdend = stat; ii->stdend = stat;
#if defined(__FreeBSD__)
callout_handle_init(&ii->timeout_handle);
#endif
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
ii->isdone = 0; ii->isdone = 0;
#endif #endif
@ -1634,10 +1639,6 @@ uhci_device_request(reqh)
if (reqh->timeout && !sc->sc_bus.use_polling) { if (reqh->timeout && !sc->sc_bus.use_polling) {
usb_timeout(uhci_timeout, ii, usb_timeout(uhci_timeout, ii,
MS_TO_TICKS(reqh->timeout), ii->timeout_handle); MS_TO_TICKS(reqh->timeout), ii->timeout_handle);
#if defined(__FreeBSD__)
} else {
callout_handle_init(&ii->timeout_handle);
#endif
} }
splx(s); splx(s);