efi_loader: refactor efi_open_protocol

[people/ms/u-boot.git] / cmd / dfu.c

diff --git a/cmd/dfu.c b/cmd/dfu.c
index d8aae262232e82a066ae83ea0e82057e41f26c26..04291f6c0805fc5de2dea644bbceb19ba39b84a5 100644 (file)
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -21,7 +21,6 @@
 
 static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       bool dfu_reset = false;
 
        if (argc < 4)
                return CMD_RET_USAGE;
@@ -30,7 +29,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        char *interface = argv[2];
        char *devstring = argv[3];
 
-       int ret, i = 0;
+       int ret;
 #ifdef CONFIG_DFU_TFTP
        unsigned long addr = 0;
        if (!strcmp(argv[1], "tftp")) {
@@ -52,67 +51,11 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
 
        int controller_index = simple_strtoul(usb_controller, NULL, 0);
-       board_usb_init(controller_index, USB_INIT_DEVICE);
-       g_dnl_clear_detach();
-       g_dnl_register("usb_dnl_dfu");
-       while (1) {
-               if (g_dnl_detach()) {
-                       /*
-                        * Check if USB bus reset is performed after detach,
-                        * which indicates that -R switch has been passed to
-                        * dfu-util. In this case reboot the device
-                        */
-                       if (dfu_usb_get_reset()) {
-                               dfu_reset = true;
-                               goto exit;
-                       }
 
-                       /*
-                        * This extra number of usb_gadget_handle_interrupts()
-                        * calls is necessary to assure correct transmission
-                        * completion with dfu-util
-                        */
-                       if (++i == 10000)
-                               goto exit;
-               }
+       run_usb_dnl_gadget(controller_index, "usb_dnl_dfu");
 
-               if (ctrlc())
-                       goto exit;
-
-               if (dfu_get_defer_flush()) {
-                       /*
-                        * Call to usb_gadget_handle_interrupts() is necessary
-                        * to act on ZLP OUT transaction from HOST PC after
-                        * transmitting the whole file.
-                        *
-                        * If this ZLP OUT packet is NAK'ed, the HOST libusb
-                        * function fails after timeout (by default it is set to
-                        * 5 seconds). In such situation the dfu-util program
-                        * exits with error message.
-                        */
-                       usb_gadget_handle_interrupts(controller_index);
-                       ret = dfu_flush(dfu_get_defer_flush(), NULL, 0, 0);
-                       dfu_set_defer_flush(NULL);
-                       if (ret) {
-                               error("Deferred dfu_flush() failed!");
-                               goto exit;
-                       }
-               }
-
-               WATCHDOG_RESET();
-               usb_gadget_handle_interrupts(controller_index);
-       }
-exit:
-       g_dnl_unregister();
-       board_usb_cleanup(controller_index, USB_INIT_DEVICE);
 done:
        dfu_free_entities();
-
-       if (dfu_reset)
-               run_command("reset", 0);
-
-       g_dnl_clear_detach();
-
        return ret;
 }