new command: memsize. new function z80_memsize_detect().

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

diff --git a/avr/cmd_boot.c b/avr/cmd_boot.c
index a83968f3ee4be7da08982cb4e406849a31240044..600bad3fffcf20fa144c80ca61e7624ea2c3617a 100644 (file)
--- a/avr/cmd_boot.c
+++ b/avr/cmd_boot.c
@@ -10,11 +10,10 @@
 /*
  * Misc boot support
  */
-#include "common.h"
+#include "cmd_boot.h"
 #include <ctype.h>
 #include <util/atomic.h>
 
-#include "command.h"
 #include "cli_readline.h"      /* console_buffer[] */
 #include "cli.h"                       /* run_command() */
 #include "env.h"
@@ -59,18 +58,11 @@ static void z80_load_mem(int_fast8_t verbosity,
        }
 }
 
-command_ret_t do_loadf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_loadf(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
-       (void) cmdtp; (void) flag; (void) argc; (void) argv;
-
-       if (z80_bus_state() & ZST_RUNNING) {
-               my_puts_P(PSTR("Can't load while CPU is running!\n"));
-               return CMD_RET_FAILURE;
-       }
-       if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-               my_puts_P(PSTR("Bus timeout\n"));
-               return  CMD_RET_FAILURE;
-       }
+       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,
@@ -112,7 +104,7 @@ void print_vars(char *title)
  *             -v      verbose
  */
 
-command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_bootcf(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
        struct {
                uint8_t  jr[2];
@@ -135,8 +127,7 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
        int_fast8_t verbosity = 0;
        uint8_t default_stages;
        uint32_t val;
-
-       (void) cmdtp; (void) flag;
+       ERRNUM res = ESUCCESS;
 
        /* get default values */
        memcpy_P(&boot_param, cfboot, sizeof boot_param);
@@ -212,16 +203,9 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
                return CMD_RET_FAILURE;
        }
 
-
-
-       if (z80_bus_state() & ZST_RUNNING) {
-               my_puts_P(PSTR("CPU is allready running!\n"));
-               return CMD_RET_FAILURE;
-       }
-       if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-               my_puts_P(PSTR("Bus timeout\n"));
-               return  CMD_RET_FAILURE;
-       }
+       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,
@@ -274,12 +258,10 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
        return CMD_RET_SUCCESS;
 }
 
-command_ret_t do_busreq_pulse(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_busreq_pulse(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
        uint16_t count=1;
 
-       (void) cmdtp; (void) flag;
-
        if (!(z80_bus_state() & ZST_RUNNING)) {
                printf_P(PSTR("## CPU is not running!\n"));
                return CMD_RET_FAILURE;
@@ -296,12 +278,10 @@ command_ret_t do_busreq_pulse(cmd_tbl_t *cmdtp, int flag, int argc, char * const
 }
 
 
-command_ret_t do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_go(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
        uint32_t addr;
 
-       (void) cmdtp; (void) flag;
-
        if (argc < 2)
                return CMD_RET_USAGE;
        addr = eval_arg(argv[1], NULL);
@@ -313,7 +293,7 @@ command_ret_t do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
 
        if (z80_bus_state() & ZST_RUNNING) {
-               printf_P(PSTR("## CPU allready running!\n"));
+               printf_P(PSTR("## CPU already running!\n"));
                return CMD_RET_FAILURE;
        }
 
@@ -348,20 +328,16 @@ void reset_cpu(bus_cmd_t mode)
 }
 
 
-command_ret_t do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_reset(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
-       (void) cmdtp; (void) flag; (void) argc; (void) argv;
-
        printf_P(PSTR("CPU now in reset state.\n"));
 
        reset_cpu(Reset);
        return CMD_RET_SUCCESS;
 }
 
-command_ret_t do_restart(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_restart(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
-       (void) cmdtp; (void) flag; (void) argc; (void) argv;
-
        reset_cpu(Restart);
 
        return CMD_RET_SUCCESS;
@@ -383,17 +359,14 @@ void print_con_usage(char esc)
        ), esc + 0x40);
 }
 
-command_ret_t do_console(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_console(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
        int ch;
        uint8_t pending;
-//     uint8_t help_prompt = 0;
        uint8_t code = 0;
        uint8_t state = 0;
        char esc_char = (char) getenv_ulong(PSTR(ENV_ESC_CHAR), 16, CONFIG_ESC_CHAR);
 
-       (void) cmdtp; (void) flag; (void) argc; (void) argv;
-
        printf_P(PSTR("Connecting to CPU. Escape character is '^%c'.\n"),
                                        esc_char + 0x40);
 
@@ -420,7 +393,7 @@ command_ret_t do_console(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
                                }
                                break;
                        case 2:
-                               printf_P(PSTR("\n"
+                               my_puts_P(PSTR("\n"
                                  "------------------------------------------------\n"));
                        case 1:
                                state = 0;
@@ -438,7 +411,7 @@ command_ret_t do_console(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
 
                                case 'X':
                                case 'Q':
-                                       printf_P(PSTR("\n"));
+                                       putchar('\n');
                                        goto quit;
                                        break;