summaryrefslogtreecommitdiff
path: root/include/usb_mass_storage.h
diff options
context:
space:
mode:
authorPrzemyslaw Marczak <p.marczak@samsung.com>2013-10-23 14:30:42 +0200
committerMarek Vasut <marex@denx.de>2013-11-08 20:46:19 +0100
commit93c813b3ac4b23df891992f93252c59231dec388 (patch)
tree09845f95edb591abcf64f35ffcb57019e6cf25e1 /include/usb_mass_storage.h
parent2cee0408e5c6f5dbdfa89fb40168ba2ead3f61a6 (diff)
downloadu-boot-imx-93c813b3ac4b23df891992f93252c59231dec388.zip
u-boot-imx-93c813b3ac4b23df891992f93252c59231dec388.tar.gz
u-boot-imx-93c813b3ac4b23df891992f93252c59231dec388.tar.bz2
usb: ums: code refactoring to improve reusability on other boards.
This patch introduces some cleanups to ums code. Changes: ums common: - introduce UMS_START_SECTOR and UMS_NUM_SECTORS as defined in usb_mass_storage.h both default values as 0 if board config doesn't define them common cleanup changes: - change name of struct "ums_board_info" to "ums" - "ums_device" fields are moved to struct ums and "dev_num" is removed - change function name: board_ums_init to ums_init - remove "extern" prefixes from usb_mass_storage.h cmd_usb_mass_storage: - change error() to printf() if need to print info message - change return values to command_ret_t type at ums command code - add command usage string Changes v2: ums common: - always returns number of read/write sectors - coding style clean-up ums gadget: - calculate amount of read/write from device returned value. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'include/usb_mass_storage.h')
-rw-r--r--include/usb_mass_storage.h33
1 files changed, 18 insertions, 15 deletions
diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index 13f535c..674ca70 100644
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -9,32 +9,35 @@
#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
-struct ums_board_info {
- int (*read_sector)(struct ums_device *ums_dev,
+#ifndef UMS_NUM_SECTORS
+#define UMS_NUM_SECTORS 0
+#endif
+
+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,
+ void (*get_capacity)(struct ums *ums_dev,
long long int *capacity);
const char *name;
- struct ums_device ums_dev;
+ struct mmc *mmc;
+ int offset;
+ int part_size;
};
-int fsg_init(struct ums_board_info *);
+extern struct ums *ums;
+
+int fsg_init(struct ums *);
void fsg_cleanup(void);
-struct ums_board_info *board_ums_init(unsigned int, unsigned int,
- unsigned int);
+struct ums *ums_init(unsigned int);
int fsg_main_thread(void *);
#ifdef CONFIG_USB_GADGET_MASS_STORAGE