command go: new option -h

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

diff --git a/avr/cmd_boot.c b/avr/cmd_boot.c
index a1afe7703a686fe119be7e19d9e04e2244535ee3..e26a8b1b3340226aa0730bd871a9a653a49b575a 100644 (file)
--- a/avr/cmd_boot.c
+++ b/avr/cmd_boot.c
@@ -31,45 +31,11 @@
 #undef const
 
 
-
-static void z80_load_mem(int_fast8_t verbosity,
-                               const FLASH unsigned char data[],
-                               const FLASH unsigned long *sections,
-                               const FLASH unsigned long address[],
-                               const FLASH unsigned long length_of_sections[])
-{
-       uint32_t sec_base = 0;
-
-       if (verbosity > 1)
-               printf_P(PSTR("Loading Z180 memory... \n"));
-
-       for (unsigned sec = 0; sec < *sections; sec++) {
-               if (verbosity > 0) {
-                       printf_P(PSTR("   From: 0x%.5lX to: 0x%.5lX    (%5li bytes)\n"),
-                                       address[sec],
-                                       address[sec]+length_of_sections[sec] - 1,
-                                       length_of_sections[sec]);
-               }
-
-               z80_write_block_P((const FLASH unsigned char *) &data[sec_base],  /* src */
-                               address[sec],                  /* dest */
-                               length_of_sections[sec]);      /* len */
-               sec_base += length_of_sections[sec];
-       }
-}
-
 command_ret_t do_loadf(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
-       ERRNUM res = ESUCCESS;
-
-       if (z80_bus_state() & ZST_RUNNING) {
-               res = ERUNNING;
-       } else if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-               res = EBUSTO;
-       }
-       if (res != ESUCCESS)
-               cmd_error(CMD_RET_FAILURE, res, NULL);
-
+       if (z80_bus_state() & ZST_RUNNING)
+               cmd_error(CMD_RET_FAILURE, ERUNNING, NULL);
+       z80_bus_request_or_exit();
        z80_load_mem(2, hdrom,
                                &hdrom_sections,
                                hdrom_address,
@@ -210,14 +176,9 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int a
                return CMD_RET_FAILURE;
        }
 
-       if (z80_bus_state() & ZST_RUNNING) {
-               res = ERUNNING;
-       } else if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-               res = EBUSTO;
-       }
-       if (res != ESUCCESS)
-               cmd_error(CMD_RET_FAILURE, res, NULL);
-
+       if (z80_bus_state() & ZST_RUNNING)
+               cmd_error(CMD_RET_FAILURE, ERUNNING, NULL);
+       z80_bus_request_or_exit();
        z80_load_mem(verbosity, cfboot,
                                &cfboot_sections,
                                cfboot_address,
@@ -293,23 +254,39 @@ 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)
+       /* reset getopt() */
+       optind = 0;
+
+       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];
@@ -321,13 +298,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;
 }