X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/16af58eaba93819b09becadf7caae0df890baed0..2dec14cd1dbf09755b0839859da1a942944a8376:/avr/cmd_boot.c

diff --git a/avr/cmd_boot.c b/avr/cmd_boot.c
index 14fbab3..b4aa5c0 100644
--- a/avr/cmd_boot.c
+++ b/avr/cmd_boot.c
@@ -10,15 +10,14 @@
 /*
  * Misc boot support
  */
-#include "common.h"
-#include <stdlib.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"
+#include "eval_arg.h"
 #include "con-utils.h"
 #include "getopt-min.h"
 #include "z80-if.h"
@@ -59,7 +58,7 @@ 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, uint_fast8_t flag, int argc, char * const argv[])
 {
 	(void) cmdtp; (void) flag; (void) argc; (void) argv;
 
@@ -112,7 +111,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, uint_fast8_t flag, int argc, char * const argv[])
 {
 	struct {
 		uint8_t  jr[2];
@@ -156,7 +155,7 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 				boot_param.stages--;
 			break;
 		case 'a':
-			val = strtoul(optarg, NULL, 16);
+			val = eval_arg(optarg, NULL);
 			if (val < 0x100 || val > 0xFE00) {
 				printf_P(PSTR("Address out of range: 0x%.4lX\n"), val);
 				return CMD_RET_FAILURE;
@@ -164,7 +163,7 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 			boot_param.loadaddr = val;
 			break;
 		case 's':
-			val = strtoul(optarg, NULL, 16);
+			val = eval_arg(optarg, NULL);
 			if (val > 255) {
 				printf_P(PSTR("Start sector out of range: 0x%lX\n"), val);
 				return CMD_RET_FAILURE;
@@ -172,7 +171,7 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 			boot_param.sec_start = val;
 			break;
 		case 'c':
-			val = strtoul(optarg, NULL, 16);
+			val = eval_arg(optarg, NULL);
 			if (val > 127) {
 				printf_P(PSTR("Sector count out of range: 0x%lX\n"), val);
 				return CMD_RET_FAILURE;
@@ -180,7 +179,7 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 			boot_param.sec_cnt = val;
 			break;
 		case 't':
-			val = strtoul(optarg, NULL, 10);
+			val = eval_arg(optarg, NULL);
 			if (val < 0x1 || val > 0xFFFF) {
 				printf_P(PSTR("Timeout value out of range: 0x%lX\n"), val);
 				return CMD_RET_FAILURE;
@@ -188,7 +187,7 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 			boot_param.timeout = val;
 			break;
 		case 'i':
-			val = strtoul(optarg, NULL, 16);
+			val = eval_arg(optarg, NULL);
 			if (val < 0x01 || val > 0xFF) {
 				printf_P(PSTR("Partition id out of range: 0x%lX\n"), val);
 				return CMD_RET_FAILURE;
@@ -274,7 +273,7 @@ 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, uint_fast8_t flag, int argc, char * const argv[])
 {
 	uint16_t count=1;
 
@@ -286,7 +285,7 @@ command_ret_t do_busreq_pulse(cmd_tbl_t *cmdtp, int flag, int argc, char * const
 	}
 
 	if (argc > 1)
-		count = (uint16_t) strtoul(argv[1], NULL, 16);
+		count = (uint16_t) eval_arg(argv[1], NULL);
 
 	z80_bus_cmd(Request);
 	while (count--)
@@ -296,7 +295,7 @@ 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, uint_fast8_t flag, int argc, char * const argv[])
 {
 	uint32_t addr;
 
@@ -304,7 +303,7 @@ command_ret_t do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	if (argc < 2)
 		return CMD_RET_USAGE;
-	addr = strtoul(argv[1], NULL, 16);
+	addr = eval_arg(argv[1], NULL);
 	if (addr >= (1UL<<16)) {
 		printf_P(PSTR("## Startaddress 0x%05lx too high.\n"
 			"   (Out of logical address space (0x00000-0x0ffff))\n"),
@@ -348,7 +347,7 @@ 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, uint_fast8_t flag, int argc, char * const argv[])
 {
 	(void) cmdtp; (void) flag; (void) argc; (void) argv;
 
@@ -358,7 +357,7 @@ command_ret_t do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
 	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, uint_fast8_t flag, int argc, char * const argv[])
 {
 	(void) cmdtp; (void) flag; (void) argc; (void) argv;
 
@@ -383,7 +382,7 @@ 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, uint_fast8_t flag, int argc, char * const argv[])
 {
 	int ch;
 	uint8_t pending;