From 98aac4d093d6eafff084fbfb49bd4a6e2c62bfe8 Mon Sep 17 00:00:00 2001 From: Leo C Date: Fri, 12 Jun 2015 11:05:06 +0200 Subject: [PATCH] change common base from C000 to F000. loadcpm3 bugfixes --- avr/cmd_loadcpm3.c | 6 +++--- avr/command_tbl.c | 8 ++++++-- z180/config.inc | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/avr/cmd_loadcpm3.c b/avr/cmd_loadcpm3.c index da1be37..324a40d 100644 --- a/avr/cmd_loadcpm3.c +++ b/avr/cmd_loadcpm3.c @@ -84,11 +84,11 @@ command_ret_t do_loadcpm3(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg if (argc > 3) banked_base = strtoul(argv[3], NULL, 16); if (argc > 2) - banked_base = strtoul(argv[2], NULL, 16); + common_base = strtoul(argv[2], NULL, 16); fname = getenv(PSTR(ENV_CPM3_SYSFILE)); - if (argc > 2) { - fname = argv[2]; + if (argc > 1) { + fname = argv[1]; } if (fname == NULL || *fname == '\0') fname = default_fname; diff --git a/avr/command_tbl.c b/avr/command_tbl.c index 72a87b9..526588c 100644 --- a/avr/command_tbl.c +++ b/avr/command_tbl.c @@ -151,7 +151,7 @@ CMD_TBL_ITEM( CMD_TBL_ITEM( loadcpm3, 3, 0, do_loadcpm3, "load CPM3.SYS file", - "[filename] [common base] [banked base]] \n" + "[filename [common-base [banked-base]]] \n" " Load CP/M 3 system file from FAT filesystem. This command makes\n" " CPMLDR superfluous. Uses the following environment variable if set:\n" " '"ENV_CPM3_SYSFILE"' File to load. Default is '"CONFIG_CPM3_SYSFILE"'.\n" @@ -206,7 +206,11 @@ CMD_TBL_ITEM( CMD_TBL_ITEM( connect, 1, 0, do_console, "Connect to CPU console i/o", - "" + "\n" + " - type the escape character followed by Q to close the connection, \n" + " or followed by ? to see other options. The default escape character \n" + " is Ctrl-^ (0x1E). It can be changed by setting env var '"ENV_ESC_CHAR"'." + ), CMD_TBL_ITEM( diff --git a/z180/config.inc b/z180/config.inc index 1d0709d..d10b113 100644 --- a/z180/config.inc +++ b/z180/config.inc @@ -46,7 +46,7 @@ PRT_PRE equ 20 ;PRT prescaler ;----------------------------------------------------- ; MMU -COMMON_SIZE equ 16*1024 ;Common Area size in bytes +COMMON_SIZE equ 4*1024 ;Common Area size in bytes ;must be multiple of 4K if (COMMON_SIZE mod 1000h) .printx COMMON_SIZE not multiple of 4K! -- 2.39.2