X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fusb_mass_storage.h;h=08ccc97cf22494a930974b24d37c09455c97446d;hb=HEAD;hp=9df3adcf2a8e042bcc3b953c0f357a9c5945d9d5;hpb=d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 9df3adc..08ccc97 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -1,24 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Samsung Electrnoics * Lukasz Majewski - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __USB_MASS_STORAGE_H__ #define __USB_MASS_STORAGE_H__ #define SECTOR_SIZE 0x200 -#include +#include #include -#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 +22,11 @@ struct ums { unsigned int start_sector; unsigned int num_sectors; const char *name; - struct mmc *mmc; + struct blk_desc block_dev; }; -extern struct ums *ums; - -int fsg_init(struct ums *); +int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx); 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__ */