}
}
-command_ret_t do_loadf(cmd_tbl_t *cmdtp, uint_fast8_t 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;
+ ERRNUM res = ESUCCESS;
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;
+ res = ERUNNING;
+ } else if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
+ res = EBUSTO;
}
+ if (res != ESUCCESS)
+ cmd_error(CMD_RET_FAILURE, res, NULL);
+
z80_load_mem(2, hdrom,
&hdrom_sections,
hdrom_address,
* -v verbose
*/
-command_ret_t do_bootcf(cmd_tbl_t *cmdtp, uint_fast8_t 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];
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);
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;
+ res = ERUNNING;
+ } else if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
+ res = EBUSTO;
}
+ if (res != ESUCCESS)
+ cmd_error(CMD_RET_FAILURE, res, NULL);
+
z80_load_mem(verbosity, cfboot,
&cfboot_sections,
cfboot_address,
return CMD_RET_SUCCESS;
}
-command_ret_t do_busreq_pulse(cmd_tbl_t *cmdtp, uint_fast8_t 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;
}
-command_ret_t do_go(cmd_tbl_t *cmdtp, uint_fast8_t 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);
}
if (z80_bus_state() & ZST_RUNNING) {
- printf_P(PSTR("## CPU allready running!\n"));
+ printf_P(PSTR("## CPU already running!\n"));
return CMD_RET_FAILURE;
}
}
-command_ret_t do_reset(cmd_tbl_t *cmdtp, uint_fast8_t 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, uint_fast8_t 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;
), esc + 0x40);
}
-command_ret_t do_console(cmd_tbl_t *cmdtp, uint_fast8_t 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);
}
break;
case 2:
- printf_P(PSTR("\n"
+ my_puts_P(PSTR("\n"
"------------------------------------------------\n"));
case 1:
state = 0;
case 'X':
case 'Q':
- printf_P(PSTR("\n"));
+ putchar('\n');
goto quit;
break;