Move console definitions into a new console.h file

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

diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c
index 346ab804541fd951316ca962ca3f5bb727f53244..488822a2eed512f68360ed5838e2aa26d65ba546 100644 (file)
--- a/common/cmd_fastboot.c
+++ b/common/cmd_fastboot.c
@@ -9,12 +9,28 @@
  */
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
+       int controller_index;
+       char *usb_controller;
        int ret;
 
+       if (argc < 2)
+               return CMD_RET_USAGE;
+
+       usb_controller = argv[1];
+       controller_index = simple_strtoul(usb_controller, NULL, 0);
+
+       ret = board_usb_init(controller_index, USB_INIT_DEVICE);
+       if (ret) {
+               error("USB init failed: %d", ret);
+               return CMD_RET_FAILURE;
+       }
+
        g_dnl_clear_detach();
        ret = g_dnl_register("usb_dnl_fastboot");
        if (ret)
@@ -23,7 +39,8 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        if (!g_dnl_board_usb_cable_connected()) {
                puts("\rUSB cable not detected.\n" \
                     "Command exit.\n");
-               return CMD_RET_FAILURE;
+               ret = CMD_RET_FAILURE;
+               goto exit;
        }
 
        while (1) {
@@ -31,17 +48,22 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                        break;
                if (ctrlc())
                        break;
-               usb_gadget_handle_interrupts();
+               usb_gadget_handle_interrupts(controller_index);
        }
 
+       ret = CMD_RET_SUCCESS;
+
+exit:
        g_dnl_unregister();
        g_dnl_clear_detach();
-       return CMD_RET_SUCCESS;
+       board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+
+       return ret;
 }
 
 U_BOOT_CMD(
-       fastboot,       1,      0,      do_fastboot,
+       fastboot, 2, 1, do_fastboot,
        "use USB Fastboot protocol",
-       "\n"
+       "<USB_controller>\n"
        "    - run as a fastboot usb device"
 );