summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo C2015-06-12 10:18:48 +0200
committerLeo C2015-06-12 10:18:48 +0200
commit7c87207c28795325744b2dbea47c0fa508d6639d (patch)
tree0dca023e9586106f0ea427db9e16f5f5c462c366
parent057817cb1dc71416bc798b5cd592acfcea87efaa (diff)
downloadz180-stamp-7c87207c28795325744b2dbea47c0fa508d6639d.zip
change common base from C000 to F000. loadcpm3 bugfixes
-rw-r--r--avr/cmd_loadcpm3.c6
-rw-r--r--avr/command_tbl.c2
-rw-r--r--z180/config.inc2
3 files changed, 5 insertions, 5 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..6a625fb 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"
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!