PERFORCE change 131608 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Tue Dec 25 11:47:26 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=131608
Change 131608 by hselasky at hselasky_laptop001 on 2007/12/25 19:46:37
Style change by "usb_style.sh".
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#88 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#88 (text+ko) ====
@@ -2755,16 +2755,16 @@
err = usbd_handle_request(xfer);
if (err) {
- if (err == USBD_BAD_CONTEXT) {
+ if (err == USBD_BAD_CONTEXT) {
+ /*
+ * Currently we get a "start" context by
+ * waking up the explore thread.
+ */
+ usb_needs_explore(xfer->udev->bus,
+ USB_BUS_EXPLORE_TREE);
+ return;
+ }
/*
- * Currently we get a "start" context by
- * waking up the explore thread.
- */
- usb_needs_explore(xfer->udev->bus,
- USB_BUS_EXPLORE_TREE);
- return;
- }
- /*
* If no control transfer is active,
* receive the next SETUP message:
*/
@@ -2787,7 +2787,7 @@
xfer->nframes = 1;
xfer->flags.manual_status = 1;
xfer->flags.force_short_xfer = 0;
- xfer->flags.stall_pipe = 1; /* cancel previous transfer, if any */
+ xfer->flags.stall_pipe = 1; /* cancel previous transfer, if any */
usbd_start_hardware(xfer);
return;
}
@@ -3004,7 +3004,6 @@
/* nothing to do */
goto tr_stalled;
}
-
if (xfer->flags_int.context != USBD_CONTEXT_START) {
/* wrong context - should not happen */
goto tr_bad_context;
@@ -3286,7 +3285,7 @@
tr_valid:
if (state == ST_POST_STATUS) {
- goto tr_stalled;
+ goto tr_stalled;
}
/* subtract offset from length */
@@ -3325,8 +3324,8 @@
if (max_len > 0) {
if (src_mcopy) {
src_mcopy = USBD_ADD_BYTES(src_mcopy, off);
- usbd_copy_in(xfer->frbuffers + 1, 0,
- src_mcopy, max_len);
+ usbd_copy_in(xfer->frbuffers + 1, 0,
+ src_mcopy, max_len);
} else {
usbd_set_frame_data(xfer,
USBD_ADD_BYTES(src_zcopy, off), 1);
@@ -3342,8 +3341,8 @@
return (0); /* success */
tr_stalled:
- PRINTFN(0, ("%s\n", (state == ST_POST_STATUS) ?
- "complete" : "stalled"));
+ PRINTFN(0, ("%s\n", (state == ST_POST_STATUS) ?
+ "complete" : "stalled"));
return (USBD_STALLED);
tr_bad_context:
More information about the p4-projects
mailing list