command: Remove the cmd_tbl_t typedef

[J-u-boot.git] / cmd / dfu.c

diff --git a/cmd/dfu.c b/cmd/dfu.c
index 91a750a4fcaac1a688bd950713ce2ef1fb732c8c..7310595a02786f5dda6987190ee40941fde2a06c 100644 (file)
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <watchdog.h>
 #include <dfu.h>
 #include <console.h>
@@ -18,37 +19,49 @@
 #include <usb.h>
 #include <net.h>
 
-static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 
-       if (argc < 4)
+       if (argc < 2)
                return CMD_RET_USAGE;
 
 #ifdef CONFIG_DFU_OVER_USB
        char *usb_controller = argv[1];
 #endif
 #if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP)
-       char *interface = argv[2];
-       char *devstring = argv[3];
+       char *interface = NULL;
+       char *devstring = NULL;
+#if defined(CONFIG_DFU_TIMEOUT) || defined(CONFIG_DFU_OVER_TFTP)
+       unsigned long value = 0;
+#endif
+
+       if (argc >= 4) {
+               interface = argv[2];
+               devstring = argv[3];
+       }
+
+#if defined(CONFIG_DFU_TIMEOUT) || defined(CONFIG_DFU_OVER_TFTP)
+       if (argc == 5 || argc == 3)
+               value = simple_strtoul(argv[argc - 1], NULL, 0);
+#endif
 #endif
 
        int ret = 0;
 #ifdef CONFIG_DFU_OVER_TFTP
-       unsigned long addr = 0;
-       if (!strcmp(argv[1], "tftp")) {
-               if (argc == 5)
-                       addr = simple_strtoul(argv[4], NULL, 0);
-
-               return update_tftp(addr, interface, devstring);
-       }
+       if (!strcmp(argv[1], "tftp"))
+               return update_tftp(value, interface, devstring);
 #endif
 #ifdef CONFIG_DFU_OVER_USB
        ret = dfu_init_env_entities(interface, devstring);
        if (ret)
                goto done;
 
+#ifdef CONFIG_DFU_TIMEOUT
+       dfu_set_timeout(value * 1000);
+#endif
+
        ret = CMD_RET_SUCCESS;
-       if (argc > 4 && strcmp(argv[4], "list") == 0) {
+       if (strcmp(argv[argc - 1], "list") == 0) {
                dfu_show_entities();
                goto done;
        }
@@ -67,17 +80,24 @@ U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
        "Device Firmware Upgrade",
        ""
 #ifdef CONFIG_DFU_OVER_USB
-       "<USB_controller> <interface> <dev> [list]\n"
+#ifdef CONFIG_DFU_TIMEOUT
+       "<USB_controller> [<interface> <dev>] [<timeout>] [list]\n"
+#else
+       "<USB_controller> [<interface> <dev>] [list]\n"
+#endif
        "  - device firmware upgrade via <USB_controller>\n"
        "    on device <dev>, attached to interface\n"
        "    <interface>\n"
+#ifdef CONFIG_DFU_TIMEOUT
+       "    [<timeout>] - specify inactivity timeout in seconds\n"
+#endif
        "    [list] - list available alt settings\n"
 #endif
 #ifdef CONFIG_DFU_OVER_TFTP
 #ifdef CONFIG_DFU_OVER_USB
        "dfu "
 #endif
-       "tftp <interface> <dev> [<addr>]\n"
+       "tftp [<interface> <dev>] [<addr>]\n"
        "  - device firmware upgrade via TFTP\n"
        "    on device <dev>, attached to interface\n"
        "    <interface>\n"