Merge branch 'u-boot-samsung/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 ffc3a13c298eee730ac85c9e5d24bc3a5149c80f..69b80cd1a367a602d97e5efb16f67777c15caa20 100644 (file)
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -2,54 +2,34 @@
  * Copyright (C) 2011 Samsung Electrnoics
  * Lukasz Majewski <l.majewski@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * aloong with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __USB_MASS_STORAGE_H__
 #define __USB_MASS_STORAGE_H__
 
 #define SECTOR_SIZE            0x200
+#include <part.h>
+#include <linux/usb/composite.h>
 
-#include <mmc.h>
+/* Wait at maximum 60 seconds for cable connection */
+#define UMS_CABLE_READY_TIMEOUT        60
 
-struct ums_device {
-       struct mmc *mmc;
-       int dev_num;
-       int offset;
-       int part_size;
-};
-
-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 *);
+extern struct ums *ums;
 
+int fsg_init(struct ums *);
+void fsg_cleanup(void);
+int fsg_main_thread(void *);
+int fsg_add(struct usb_configuration *c);
 #endif /* __USB_MASS_STORAGE_H__ */