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

Diff reduction to NetBSD.

Browse Source 
MFNetBSD 1.177; author: toshii
   Use the correct wValue to get hub desriptors.
   Also, make wValue checks of root hub codes less strict.

MFNetBSD 1.178: author: martin
   Interrupt descriptors might become invalid while being processed in
   uhci_check_intr - so remember their next pointer before calling it.
   Patch provided by Matthew Orgass in PR kern/24542.

Obtained from:   NetBSD
This commit is contained in:
Lukas Ertl 2004-05-23 11:43:34 +00:00
parent e0026a65f9
commit 5ac85402da
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=129606
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@
* $NetBSD: uhci.c,v 1.173 2003/05/13 04:41:59 gson Exp $
* $NetBSD: uhci.c,v 1.175 2003/09/12 16:18:08 mycroft Exp $
* $NetBSD: uhci.c,v 1.176 2003/11/04 19:11:21 mycroft Exp $
* $NetBSD: uhci.c,v 1.177 2003/12/29 08:17:10 toshii Exp $
* $NetBSD: uhci.c,v 1.178 2004/03/02 16:32:05 martin Exp $
*/
#include <sys/cdefs.h>
@ -1268,7 +1270,7 @@ void
uhci_softintr(void *v)
{
uhci_softc_t *sc = v;
uhci_intr_info_t *ii;
uhci_intr_info_t *ii, *nextii;
DPRINTFN(10,("%s: uhci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev),
sc->sc_bus.intr_context));
@ -1286,7 +1288,7 @@ uhci_softintr(void *v)
* We scan all interrupt descriptors to see if any have
* completed.
*/
LIST_FOREACH(ii, &sc->sc_intrhead, list)
LIST_FOREACH_SAFE(ii, &sc->sc_intrhead, list, nextii)
uhci_check_intr(sc, ii);
#ifdef USB_USE_SOFTINTR
@ -3341,7 +3343,7 @@ uhci_root_ctrl_start(usbd_xfer_handle xfer)
}
break;
case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE):
if (value != 0) {
if ((value & 0xff) != 0) {
err = USBD_IOERROR;
goto ret;
}