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

diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index e08deb4ddf..5804b70c35 100644
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -9,43 +9,25 @@
 #define __USB_MASS_STORAGE_H__
 
 #define SECTOR_SIZE		0x200
-
-#include <mmc.h>
+#include <part.h>
 #include <linux/usb/composite.h>
 
-struct ums_device {
-	struct mmc *mmc;
-	int dev_num;
-	int offset;
-	int part_size;
-};
+/* Wait at maximum 60 seconds for cable connection */
+#define UMS_CABLE_READY_TIMEOUT	60
 
-struct ums_board_info {
-	int (*read_sector)(struct ums_device *ums_dev,
+struct ums {
+	int (*read_sector)(struct ums *ums_dev,
 			   ulong start, lbaint_t blkcnt, void *buf);
-	int (*write_sector)(struct ums_device *ums_dev,
+	int (*write_sector)(struct ums *ums_dev,
 			    ulong start, lbaint_t blkcnt, const void *buf);
-	void (*get_capacity)(struct ums_device *ums_dev,
-			     long long int *capacity);
+	unsigned int start_sector;
+	unsigned int num_sectors;
 	const char *name;
-	struct ums_device ums_dev;
+	block_dev_desc_t block_dev;
 };
 
-extern void board_usb_init(void);
-
-extern int fsg_init(struct ums_board_info *);
-extern void fsg_cleanup(void);
-extern struct ums_board_info *board_ums_init(unsigned int,
-					     unsigned int, unsigned int);
-extern int usb_gadget_handle_interrupts(void);
-extern int fsg_main_thread(void *);
-
-#ifdef CONFIG_USB_GADGET_MASS_STORAGE
+int fsg_init(struct ums *ums_devs, int count);
+void fsg_cleanup(void);
+int fsg_main_thread(void *);
 int fsg_add(struct usb_configuration *c);
-#else
-int fsg_add(struct usb_configuration *c)
-{
-	return 0;
-}
-#endif
 #endif /* __USB_MASS_STORAGE_H__ */