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

[J-u-boot.git] / common / cmd_usb_mass_storage.c

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index ccf7195946e19491edb931d84cd4b159921112dc..5f557d5f857df2916cc5f818abbd8ac1b5e08b1c 100644 (file)
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -5,68 +5,89 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#include <errno.h>
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 #include <usb_mass_storage.h>
 
 int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
                               int argc, char * const argv[])
 {
-       char *ep;
-       unsigned int dev_num = 0, offset = 0, part_size = 0;
-       int rc;
+       if (argc < 3)
+               return CMD_RET_USAGE;
 
-       struct ums_board_info *ums_info;
-       static char *s = "ums";
+       const char *usb_controller = argv[1];
+       const char *mmc_devstring  = argv[2];
 
-       if (argc < 2) {
-               printf("usage: ums <dev> - e.g. ums 0\n");
-               return 0;
-       }
+       unsigned int dev_num = simple_strtoul(mmc_devstring, NULL, 0);
 
-       dev_num = (int)simple_strtoul(argv[1], &ep, 16);
+       struct ums *ums = ums_init(dev_num);
+       if (!ums)
+               return CMD_RET_FAILURE;
 
-       if (dev_num) {
-               puts("\nSet eMMC device to 0! - e.g. ums 0\n");
-               goto fail;
+       unsigned int controller_index = (unsigned int)(simple_strtoul(
+                                       usb_controller, NULL, 0));
+       if (board_usb_init(controller_index, USB_INIT_DEVICE)) {
+               error("Couldn't init USB controller.");
+               return CMD_RET_FAILURE;
        }
 
-       board_usb_init();
-       ums_info = board_ums_init(dev_num, offset, part_size);
-
-       if (!ums_info) {
-               printf("MMC: %d -> NOT available\n", dev_num);
-               goto fail;
-       }
-       rc = fsg_init(ums_info);
+       int rc = fsg_init(ums);
        if (rc) {
-               printf("cmd ums: fsg_init failed\n");
-               goto fail;
+               error("fsg_init failed");
+               return CMD_RET_FAILURE;
        }
 
-       g_dnl_register(s);
+       g_dnl_register("ums");
 
-       while (1) {
-               /* Handle control-c and timeouts */
-               if (ctrlc()) {
-                       printf("The remote end did not respond in time.\n");
-                       goto exit;
+       /* Timeout unit: seconds */
+       int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;
+
+       if (!usb_cable_connected()) {
+               puts("Please connect USB cable.\n");
+
+               while (!usb_cable_connected()) {
+                       if (ctrlc()) {
+                               puts("\rCTRL+C - Operation aborted.\n");
+                               goto exit;
+                       }
+                       if (!cable_ready_timeout) {
+                               puts("\rUSB cable not detected.\n" \
+                                    "Command exit.\n");
+                               goto exit;
+                       }
+
+                       printf("\rAuto exit in: %.2d s.", cable_ready_timeout);
+                       mdelay(1000);
+                       cable_ready_timeout--;
                }
+               puts("\r\n");
+       }
+
+       while (1) {
                usb_gadget_handle_interrupts();
-               /* Check if USB cable has been detached */
-               if (fsg_main_thread(NULL) == EIO)
+
+               rc = fsg_main_thread(NULL);
+               if (rc) {
+                       /* Check I/O error */
+                       if (rc == -EIO)
+                               printf("\rCheck USB cable connection\n");
+
+                       /* Check CTRL+C */
+                       if (rc == -EPIPE)
+                               printf("\rCTRL+C - Operation aborted\n");
+
                        goto exit;
+               }
        }
 exit:
        g_dnl_unregister();
-       return 0;
-
-fail:
-       return -1;
+       return CMD_RET_SUCCESS;
 }
 
 U_BOOT_CMD(ums, CONFIG_SYS_MAXARGS, 1, do_usb_mass_storage,
        "Use the UMS [User Mass Storage]",
-       "ums - User Mass Storage Gadget"
+       "ums <USB_controller> <mmc_dev>  e.g. ums 0 0"
 );