PERFORCE change 175279 for review

[Hans Petter Selasky]

http://p4web.freebsd.org/chv.cgi?CH=175279

Change 175279 by hselasky at hselasky_laptop001 on 2010/03/02 08:24:28

	
	USB CORE (Device Side):
		- make sure there is a way to reset the endpoint
		  FIFO on transfer errors for ISOCHRONOUS transfers
		- patch by: HPS @

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#175 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#175 (text+ko) ====

@@ -2410,21 +2410,24 @@
 	 * Check if we are supposed to stall the endpoint:
 	 */
 	if (xfer->flags.stall_pipe) {
+		struct usb_device *udev;
+		struct usb_xfer_root *info;
+
 		/* clear stall command */
 		xfer->flags.stall_pipe = 0;
 
+		/* get pointer to USB device */
+		info = xfer->xroot;
+		udev = info->udev;
+
 		/*
 		 * Only stall BULK and INTERRUPT endpoints.
 		 */
 		type = (ep->edesc->bmAttributes & UE_XFERTYPE);
 		if ((type == UE_BULK) ||
 		    (type == UE_INTERRUPT)) {
-			struct usb_device *udev;
-			struct usb_xfer_root *info;
 			uint8_t did_stall;
 
-			info = xfer->xroot;
-			udev = info->udev;
 			did_stall = 1;
 
 			if (udev->flags.usb_mode == USB_MODE_DEVICE) {
@@ -2452,6 +2455,17 @@
 				ep->is_stalled = 1;
 				return;
 			}
+		} else if (type == UE_ISOCHRONOUS) {
+
+			/* 
+			 * Make sure any FIFO overflow or other FIFO
+			 * error conditions go away by resetting the
+			 * endpoint FIFO through the clear stall
+			 * method.
+			 */
+			if (udev->flags.usb_mode == USB_MODE_DEVICE) {
+				(udev->bus->methods->clear_stall) (udev, ep);
+			}
 		}
 	}
 	/* Set or clear stall complete - special case */