Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Sep 2012 15:45:24 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240999 - head/sys/dev/usb/controller
Message-ID:  <201209271545.q8RFjOED046063@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Thu Sep 27 15:45:24 2012
New Revision: 240999
URL: http://svn.freebsd.org/changeset/base/240999

Log:
  Make sure the "wMaxPacketSize" limitations are respected.

Modified:
  head/sys/dev/usb/controller/dwc_otg.c

Modified: head/sys/dev/usb/controller/dwc_otg.c
==============================================================================
--- head/sys/dev/usb/controller/dwc_otg.c	Thu Sep 27 15:23:38 2012	(r240998)
+++ head/sys/dev/usb/controller/dwc_otg.c	Thu Sep 27 15:45:24 2012	(r240999)
@@ -3974,9 +3974,34 @@ dwc_otg_ep_init(struct usb_device *udev,
 				return;
 			}
 		} else {
-			if (udev->speed != USB_SPEED_LOW &&
-			    udev->speed != USB_SPEED_FULL &&
-			    udev->speed != USB_SPEED_HIGH) {
+			uint16_t mps;
+
+			mps = UGETW(edesc->wMaxPacketSize);
+
+			/* Apply limitations of our USB host driver */
+
+			switch (udev->speed) {
+			case USB_SPEED_HIGH:
+				if (mps > 512) {
+					DPRINTF("wMaxPacketSize=0x%04x"
+					    "is not supported\n", (int)mps);
+					/* not supported */
+					return;
+				}
+				break;
+
+			case USB_SPEED_FULL:
+			case USB_SPEED_LOW:
+				if (mps > 188) {
+					DPRINTF("wMaxPacketSize=0x%04x"
+					    "is not supported\n", (int)mps);
+					/* not supported */
+					return;
+				}
+				break;
+
+			default:
+				DPRINTF("Invalid device speed\n");
 				/* not supported */
 				return;
 			}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209271545.q8RFjOED046063>