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

Reorgansise the logic for tranversing the pipe list.

Browse Source 
Submitted by:	Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2009-06-02 17:31:59 +00:00
parent 017eb6e4b2
commit 115df0b6d2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=193318
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/usb/usb_request.c
View File

@ -109,11 +109,11 @@ usb2_do_clear_stall_callback(struct usb_xfer *xfer)
pipe_end = udev->pipes + udev->pipes_max; pipe_end = udev->pipes + udev->pipes_max;
pipe_first = udev->pipes; pipe_first = udev->pipes;
to = udev->pipes_max; to = udev->pipes_max;
if (pipe == NULL) {
pipe = pipe_first;
}
switch (USB_GET_STATE(xfer)) { switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED: case USB_ST_TRANSFERRED:
if (pipe == NULL)
goto tr_setup; /* device was unconfigured */
if (pipe->edesc && if (pipe->edesc &&
pipe->is_stalled) { pipe->is_stalled) {
pipe->toggle_next = 0; pipe->toggle_next = 0;
@ -126,9 +126,10 @@ usb2_do_clear_stall_callback(struct usb_xfer *xfer)
case USB_ST_SETUP: case USB_ST_SETUP:
tr_setup: tr_setup:
if (pipe == pipe_end) { if (to == 0)
pipe = pipe_first; break; /* no pipes - nothing to do */
} if ((pipe < pipe_first) || (pipe >= pipe_end))
pipe = pipe_first; /* pipe wrapped around */
if (pipe->edesc && if (pipe->edesc &&
pipe->is_stalled) { pipe->is_stalled) {
@ -156,9 +157,8 @@ usb2_do_clear_stall_callback(struct usb_xfer *xfer)
break; break;
} }
pipe++; pipe++;
if (--to) to--;
goto tr_setup; goto tr_setup;
break;
default: default:
if (xfer->error == USB_ERR_CANCELLED) { if (xfer->error == USB_ERR_CANCELLED) {