From: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Date: Fri, 10 Aug 2012 16:26:50 +0000 (+0200)
Subject: usb_storage: Restore non-EHCI support
X-Git-Tag: v2012.10-rc1~96^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cffcc503580907d733e694d505e12ff6ec6c679a;p=u-boot

usb_storage: Restore non-EHCI support

The commit 5dd95cf made the MSC driver EHCI-specific. This patch restores a
basic support of non-EHCI HCDs, like before that commit.

The fallback transfer size is certainly not optimal, but at least it should work
like before.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Ilya Yanok <ilya.yanok@cogentembedded.com>
Cc: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
---

diff --git a/common/usb_storage.c b/common/usb_storage.c
index bdc306f587..0cd6399a3c 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -155,11 +155,15 @@ struct us_data {
 	trans_cmnd	transport;		/* transport routine */
 };
 
+#ifdef CONFIG_USB_EHCI
 /*
  * The U-Boot EHCI driver cannot handle more than 5 page aligned buffers
  * of 4096 bytes in a transfer without running itself out of qt_buffers
  */
 #define USB_MAX_XFER_BLK(start, blksz)	(((4096 * 5) - (start % 4096)) / blksz)
+#else
+#define USB_MAX_XFER_BLK(start, blksz)	20
+#endif
 
 static struct us_data usb_stor[USB_MAX_STOR_DEV];