Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct status value check for OHCI isoc transfer; 

the spec says that "not accessed" is 111x, not 1111.
This commit is contained in:
toshii 2005-04-17 14:46:49 +00:00
parent b8171ad79a
commit 2db3ae3497
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/usb/ohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ohci.c,v 1.157 2005/03/11 19:25:22 mycroft Exp $ */
/* $NetBSD: ohci.c,v 1.158 2005/04/17 14:46:49 toshii Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.157 2005/03/11 19:25:22 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.158 2005/04/17 14:46:49 toshii Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1411,10 +1411,12 @@ ohci_softintr(void *v)
for (j = 0; j < iframes; i++, j++) {
len = le16toh(sitd->
itd.itd_offset[j]);
len =
(OHCI_ITD_PSW_GET_CC(len) ==
OHCI_CC_NOT_ACCESSED) ? 0 :
OHCI_ITD_PSW_LENGTH(len);
if ((OHCI_ITD_PSW_GET_CC(len) &
OHCI_CC_NOT_ACCESSED_MASK)
== OHCI_CC_NOT_ACCESSED)
len = 0;
else
len = OHCI_ITD_PSW_LENGTH(len);
xfer->frlengths[i] = len;
actlen += len;
}

5
sys/dev/usb/ohcireg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ohcireg.h,v 1.19 2002/07/11 21:14:27 augustss Exp $ */
/* $NetBSD: ohcireg.h,v 1.20 2005/04/17 14:46:49 toshii Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.8 1999/11/17 22:33:40 n_hibma Exp $ */
@ -239,7 +239,8 @@ typedef struct {
#define OHCI_CC_DATA_UNDERRUN 9
#define OHCI_CC_BUFFER_OVERRUN 12
#define OHCI_CC_BUFFER_UNDERRUN 13
#define OHCI_CC_NOT_ACCESSED 15
#define OHCI_CC_NOT_ACCESSED 14
#define OHCI_CC_NOT_ACCESSED_MASK 14
/* Some delay needed when changing certain registers. */
#define OHCI_ENABLE_POWER_DELAY 5