trats/trats2: enable CONFIG_RANDOM_UUID

[karo-tx-uboot.git] / common / cmd_usb_mass_storage.c

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index f583cafa35abfe9828a3c8a861907e3b5707153a..5f557d5f857df2916cc5f818abbd8ac1b5e08b1c 100644 (file)
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -5,6 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#include <errno.h>
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
@@ -20,55 +21,73 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
        const char *usb_controller = argv[1];
        const char *mmc_devstring  = argv[2];
 
-       unsigned int dev_num = (unsigned int)(simple_strtoul(mmc_devstring,
-                               NULL, 0));
-       if (dev_num) {
-               error("Set eMMC device to 0! - e.g. ums 0");
-               goto fail;
-       }
+       unsigned int dev_num = simple_strtoul(mmc_devstring, NULL, 0);
+
+       struct ums *ums = ums_init(dev_num);
+       if (!ums)
+               return CMD_RET_FAILURE;
 
        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.");
-               goto fail;
-       }
-
-       struct ums_board_info *ums_info = board_ums_init(dev_num, 0, 0);
-       if (!ums_info) {
-               error("MMC: %d -> NOT available", dev_num);
-               goto fail;
+               return CMD_RET_FAILURE;
        }
 
-       int rc = fsg_init(ums_info);
+       int rc = fsg_init(ums);
        if (rc) {
                error("fsg_init failed");
-               goto fail;
+               return CMD_RET_FAILURE;
        }
 
        g_dnl_register("ums");
 
-       while (1) {
-               /* Handle control-c and timeouts */
-               if (ctrlc()) {
-                       error("The remote end did not respond in time.");
-                       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]",
-       "<USB_controller> <mmc_dev>"
+       "ums <USB_controller> <mmc_dev>  e.g. ums 0 0"
 );