/*
- * (C) Copyright 2015 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2015,2016 Leo C. <erbl259-lmu@yahoo.de>
*
* SPDX-License-Identifier: GPL-2.0
*/
* See CP/M 3 System Manual, Appendix D: CPM3.SYS File Format
*/
-#include "common.h"
-#include <stdlib.h>
+#include "cmd_loadcpm3.h"
#include <ctype.h>
-#include <string.h>
-#include <stdbool.h>
-#include "command.h"
#include "env.h"
#include "ff.h"
+#include "eval_arg.h"
#include "con-utils.h"
#include "z80-if.h"
#include "debug.h"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-command_ret_t do_loadcpm3(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_loadcpm3(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
{
uint16_t mem_top;
uint8_t res_len;
CONFIG_CPM3_BANKED_BASE);
if (argc > 3)
- banked_base = strtoul(argv[3], NULL, 16);
+ banked_base = eval_arg(argv[3], NULL);
if (argc > 2)
- common_base = strtoul(argv[2], NULL, 16);
+ common_base = eval_arg(argv[2], NULL);
- fname = getenv_char(PSTR(ENV_CPM3_SYSFILE));
+ fname = getenv_str(PSTR(ENV_CPM3_SYSFILE));
if (argc > 1) {
fname = argv[1];
}