Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / usb_mass_storage.h

diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index 35cdcc3d8c7ae77d500f4ca7de85f2a2993a08d4..058dcf11740423569c13a4cd8e5957aa09afb0fd 100644 (file)
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -9,34 +9,44 @@
 #define __USB_MASS_STORAGE_H__
 
 #define SECTOR_SIZE            0x200
-
 #include <mmc.h>
+#include <linux/usb/composite.h>
 
-struct ums_device {
-       struct mmc *mmc;
-       int dev_num;
-       int offset;
-       int part_size;
-};
+#ifndef UMS_START_SECTOR
+#define UMS_START_SECTOR       0
+#endif
+
+#ifndef UMS_NUM_SECTORS
+#define UMS_NUM_SECTORS                0
+#endif
 
-struct ums_board_info {
-       int (*read_sector)(struct ums_device *ums_dev,
+/* Wait at maximum 60 seconds for cable connection */
+#define UMS_CABLE_READY_TIMEOUT        60
+
+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;
+       struct mmc *mmc;
 };
 
-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 *);
-
+extern struct ums *ums;
+
+int fsg_init(struct ums *);
+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__ */