reset optind before executing command

[z180-stamp.git] / avr / cmd_boot.c

diff --git a/avr/cmd_boot.c b/avr/cmd_boot.c
index 2159608e4055bcc600a54cdf6670f1bc49051cd2..dcf834d7532eef4f667ecbcf92ddc653f11c1444 100644 (file)
--- a/avr/cmd_boot.c
+++ b/avr/cmd_boot.c
@@ -106,9 +106,6 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int a
        memcpy_P(&boot_param, cfboot, sizeof boot_param);
        default_stages = boot_param.stages;
 
-       /* reset getopt() */
-       optind = 0;
-
        int opt;
        while ((opt = getopt(argc, argv, PSTR("vna:s:c:t:i:"))) != -1) {
                switch (opt) {
@@ -254,23 +251,36 @@ command_ret_t do_busreq_pulse(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED,
 command_ret_t do_go(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
        uint32_t addr;
+       bool hold = 0;
 
-       if (argc < 2)
+       int opt;
+       while ((opt = getopt(argc, argv, PSTR("h"))) != -1) {
+               switch (opt) {
+               case 'h':
+                       hold = 1;
+                       break;
+               default: /* '?' */
+                       return CMD_RET_USAGE;
+               }
+       }
+       argc -= optind; /* remaining arguments */
+
+       if (argc != 1)
                return CMD_RET_USAGE;
-       addr = eval_arg(argv[1], NULL);
+       addr = eval_arg(argv[optind], NULL);
        if (addr >= (1UL<<16)) {
-               printf_P(PSTR("## Startaddress 0x%05lx too high.\n"
+               printf_P(PSTR("Invalid startaddress: 0x%05lx\n"
                        "   (Out of logical address space (0x00000-0x0ffff))\n"),
                        addr);
                return CMD_RET_FAILURE;
        }
 
        if (z80_bus_state() & ZST_RUNNING) {
-               printf_P(PSTR("## CPU already running!\n"));
+               printf_P(PSTR("CPU already running!\n"));
                return CMD_RET_FAILURE;
        }
 
-       printf_P(PSTR("## Starting application at 0x%04lx ...\n"), addr);
+       printf_P(PSTR("Starting application at 0x%04lx ...\n"), addr);
 
        if (addr != 0) {
                uint8_t tmp[3];
@@ -282,13 +292,19 @@ command_ret_t do_go(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc,
                z80_write(2, (addr >> 8));
 
                z80_bus_cmd(Run);
+               _delay_us(10);
                z80_bus_cmd(M_Cycle);
+               _delay_us(10);
                z80_bus_cmd(M_Cycle);
+               _delay_us(10);
                z80_write_block(tmp, 0, 3);
-       } else
+       } else {
+               if (!hold)
+                       z80_bus_cmd(Request);
                z80_bus_cmd(Run);
-
-       z80_bus_cmd(Release);
+       }
+       if (!hold)
+               z80_bus_cmd(Release);
 
        return CMD_RET_SUCCESS;
 }