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

sync w/ NetBSD

Browse Source 
part of:
revision 1.101
date: 2002/06/01 23:51:04;  author: lukem;  state: Exp;  lines: +5 -7
This commit is contained in:
jmg 2003-07-15 22:19:00 +00:00
parent 0853c5dd33
commit 86f3663017
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/usb/usb_port.h
View File

@ -473,6 +473,8 @@ __CONCAT(dname,_detach)(device_t self)
#define SIMPLEQ_NEXT STAILQ_NEXT
#define SIMPLEQ_FIRST STAILQ_FIRST
#define SIMPLEQ_HEAD STAILQ_HEAD
#define SIMPLEQ_EMPTY STAILQ_EMPTY
#define SIMPLEQ_FOREACH STAILQ_FOREACH
#define SIMPLEQ_INIT STAILQ_INIT
#define SIMPLEQ_HEAD_INITIALIZER STAILQ_HEAD_INITIALIZER
#define SIMPLEQ_ENTRY STAILQ_ENTRY

6
sys/dev/usb/usbdi.c
View File

@ -155,9 +155,7 @@ usbd_dump_queue(usbd_pipe_handle pipe)
usbd_xfer_handle xfer;
printf("usbd_dump_queue: pipe=%p\n", pipe);
for (xfer = SIMPLEQ_FIRST(&pipe->queue);
xfer;
xfer = SIMPLEQ_NEXT(xfer, next)) {
SIMPLEQ_FOREACH(xfer, &pipe->queue, next) {
printf(" xfer=%p\n", xfer);
}
}
@ -270,7 +268,7 @@ usbd_close_pipe(usbd_pipe_handle pipe)
if (--pipe->refcnt != 0)
return (USBD_NORMAL_COMPLETION);
if (SIMPLEQ_FIRST(&pipe->queue) != 0)
if (! SIMPLEQ_EMPTY(&pipe->queue))
return (USBD_PENDING_REQUESTS);
LIST_REMOVE(pipe, next);
pipe->endpoint->refcnt--;