X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fusb_mass_storage.h;h=5804b70c354d571c3c3bce8fdbd8f560ea088b8e;hb=02499e4edc885b3064c76f8b6e84d9ff8d7a6b4b;hp=9df3adcf2a8e042bcc3b953c0f357a9c5945d9d5;hpb=15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f;p=u-boot

diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index 9df3adcf2a..5804b70c35 100644
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -9,16 +9,11 @@
 #define __USB_MASS_STORAGE_H__
 
 #define SECTOR_SIZE		0x200
-#include <mmc.h>
+#include <part.h>
 #include <linux/usb/composite.h>
 
-#ifndef UMS_START_SECTOR
-#define UMS_START_SECTOR	0
-#endif
-
-#ifndef UMS_NUM_SECTORS
-#define UMS_NUM_SECTORS		0
-#endif
+/* Wait at maximum 60 seconds for cable connection */
+#define UMS_CABLE_READY_TIMEOUT	60
 
 struct ums {
 	int (*read_sector)(struct ums *ums_dev,
@@ -28,22 +23,11 @@ struct ums {
 	unsigned int start_sector;
 	unsigned int num_sectors;
 	const char *name;
-	struct mmc *mmc;
+	block_dev_desc_t block_dev;
 };
 
-extern struct ums *ums;
-
-int fsg_init(struct ums *);
+int fsg_init(struct ums *ums_devs, int count);
 void fsg_cleanup(void);
-struct ums *ums_init(unsigned int);
 int fsg_main_thread(void *);
-
-#ifdef CONFIG_USB_GADGET_MASS_STORAGE
 int fsg_add(struct usb_configuration *c);
-#else
-int fsg_add(struct usb_configuration *c)
-{
-	return 0;
-}
-#endif
 #endif /* __USB_MASS_STORAGE_H__ */