This patch adds the USB Mass Storage Gadget to u-boot New command called "ums" is implemented to provide access to on-device embedded persistent memory.
USB Mass Storage is supposed to work on top of the USB Gadget framework
Signed-off-by: Lukasz Majewski l.majewski@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Remy Bohmer linux@bohmer.net --- common/Makefile | 1 + common/cmd_usb_mass_storage.c | 78 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/Makefile | 1 + include/usb_mass_storage.h | 56 +++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 0 deletions(-) create mode 100644 common/cmd_usb_mass_storage.c create mode 100644 include/usb_mass_storage.h
diff --git a/common/Makefile b/common/Makefile index 224b7cc..2fc1437 100644 --- a/common/Makefile +++ b/common/Makefile @@ -158,6 +158,7 @@ COBJS-y += cmd_usb.o COBJS-y += usb.o COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o endif +COBJS-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c new file mode 100644 index 0000000..03fde2f --- /dev/null +++ b/common/cmd_usb_mass_storage.c @@ -0,0 +1,78 @@ +/* + * 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 + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <errno.h> +#include <common.h> +#include <command.h> +#include <usb_mass_storage.h> + +#undef UMS_DBG +#define UMS_DBG(fmt, args...) printf(fmt, ##args) +/* #define UMS_DBG(...) */ + +int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + char *ep; + unsigned int dev_num = 0, offset = 0, part_size = 0; + + struct ums_board_info *ums_info; + + if (argc < 2) { + printf("usage: ums <dev> - e.g. ums 0\n"); + return 0; + } + + dev_num = (int)simple_strtoul(argv[1], &ep, 16); + + if (dev_num) { + puts("\nSet eMMC device to 0! - e.g. ums 0\n"); + goto fail; + } + + ums_info = board_ums_init(dev_num, offset, part_size); + + if (!ums_info) { + printf("MMC: %d -> NOT available\n", dev_num); + goto fail; + } + + fsg_init(ums_info); + while (1) { + int irq_res; + /* Handle control-c and timeouts */ + if (ctrlc()) { + printf("The remote end did not respond in time.\n"); + goto fail; + } + + irq_res = usb_gadget_handle_interrupts(); + + /* Check if USB cable has been detached */ + if (fsg_main_thread(NULL) == EIO) + goto fail; + } +fail: + return -1; +} + +U_BOOT_CMD(ums, CONFIG_SYS_MAXARGS, 1, do_usb_mass_storage, + "Use the UMS [User Mass Storage]", + "ums - User Mass Storage Gadget" +); diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 6717e4f..1d27b42 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -28,6 +28,7 @@ LIB := $(obj)libusb_gadget.o # new USB gadget layer dependencies ifdef CONFIG_USB_GADGET COBJS-y += epautoconf.o config.o usbstring.o +COBJS-$(CONFIG_USB_GADGET_MASS_STORAGE) += file_storage.o COBJS-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o else # Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h new file mode 100644 index 0000000..3154f49 --- /dev/null +++ b/include/usb_mass_storage.h @@ -0,0 +1,56 @@ +/* + * 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 + */ + +#ifndef __USB_MASS_STORAGE_H__ +#define __USB_MASS_STORAGE_H__ + +#define SECTOR_SIZE 0x200 + +#include <mmc.h> + +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, + unsigned int n, void *buf); + int (*write_sector)(struct ums_device *ums_dev, + unsigned int n, void *buf); + void (*get_capacity)(struct ums_device *ums_dev, + long long int *capacity); + const char *name; + struct ums_device ums_dev; +}; + +extern int fsg_init(struct ums_board_info *); +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 *); + +/* USB Attach/Detach */ +extern int micro_usb_attached(void); +extern int micro_usb_detach(void); + +#endif /* __USB_MASS_STORAGE_H__ */