X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/2f53dd651e4bc075376ade16897272b41fd08a14..e4c4b148ced1347935dff6200380e90cb3bfcde3:/avr/command_tbl.c

diff --git a/avr/command_tbl.c b/avr/command_tbl.c
index 02d8ac8..238f132 100644
--- a/avr/command_tbl.c
+++ b/avr/command_tbl.c
@@ -1,10 +1,13 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
 
 #include "common.h"
-
 #include "command.h"
 #include "cmd_mem.h"
 
-
 extern command_ret_t do_help(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_echo(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_sleep(cmd_tbl_t *, int, int, char * const []);
@@ -13,6 +16,8 @@ extern command_ret_t do_env_default(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_env_set(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_env_save(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_loadf(cmd_tbl_t *, int, int, char * const []);
+extern command_ret_t do_loadcpm3(cmd_tbl_t *, int, int, char * const []);
+extern command_ret_t do_loadihex(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_go(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_restart(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_console(cmd_tbl_t *, int, int, char * const []);
@@ -24,8 +29,9 @@ extern command_ret_t do_gpio(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_sd(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_fat_stat(cmd_tbl_t *, int, int, char * const []);
 extern command_ret_t do_fat_ls(cmd_tbl_t *, int, int, char * const []);
-extern command_ret_t do_fat_read(cmd_tbl_t *, int, int, char * const []);
-extern command_ret_t do_fat_write(cmd_tbl_t *, int, int, char * const []);
+//extern command_ret_t do_fat_read(cmd_tbl_t *, int, int, char * const []);
+//extern command_ret_t do_fat_write(cmd_tbl_t *, int, int, char * const []);
+extern command_ret_t do_fat_rw(cmd_tbl_t *, int, int, char * const []);
 
 #ifdef CONFIG_SYS_LONGHELP
 const FLASH char sd_help_text[] =
@@ -38,14 +44,14 @@ cmd_tbl_t cmd_tbl[] = {
 
 CMD_TBL_ITEM(
 	date,	2,	1,	do_date,
-	"get/set/reset date & time",
+	"get/set date & time",
 	"[MMDDhhmm[[CC]YY][.ss]]\ndate reset\n"
 	"  - without arguments: print date & time\n"
 	"  - with numeric argument: set the system date & time\n"
-	"  - with 'reset' argument: reset the RTC"
 ),
 
 #ifdef DEBUG
+
 CMD_TBL_ITEM(
 	!mdr,	3,	1,	do_dump_mem,
 	"RAM dump",
@@ -121,6 +127,20 @@ CMD_TBL_ITEM(
 	"load srec_cat prepared image from controller flash",
 	""
 ),
+CMD_TBL_ITEM(
+	loadcpm3, 3,	0,	do_loadcpm3,
+	"load CPM3.SYS file",
+	"[offset] [filename]\n"
+	"    - Load CP/M 3 system file from FAT filesystem. This command makes\n"
+	"      CPMLDR superfluous. Default filename is '"CONFIG_PATH_CPM3SYS"', but\n"
+	"      uses environment variable '"ENV_PATH_CPM3SYS"', if set."
+),
+CMD_TBL_ITEM(
+	loadi,	2,	0,	do_loadihex,
+	"load intel hex file over serial line",
+	"[[-]offset]\n"
+	"    - load Intel-Hex-Record file over serial line with offset 'offset'"
+),
 CMD_TBL_ITEM(
 	go,	2,	0,	do_go,
 	"start application at address 'addr'",
@@ -140,7 +160,7 @@ CMD_TBL_ITEM(
 	""
 ),
 CMD_TBL_ITEM(
-	connect, 1, 1,	do_console,
+	connect, 1, 0,	do_console,
 	"Connect to CPU console i/o",
 	""
 ),
@@ -202,23 +222,21 @@ CMD_TBL_ITEM(
 	"    - set address offset for memory commands to 'offset'"
 ),
 CMD_TBL_ITEM(
-	loop,	3,	1,	do_mem_loop,
+	mloop,	3,	1,	do_mem_loop,
 	"infinite loop on address range",
 	"address number_of_bytes"
 ),
-#ifdef CONFIG_LOOPW
 CMD_TBL_ITEM(
-	loopw,	4,	1,	do_mem_loopw,
+	mloopw,	4,	1,	do_mem_loopw,
 	"infinite write loop on address range",
 	"address number_of_bytes data_to_write"
 ),
-#endif /* CONFIG_LOOPW */
 
 #ifdef CONFIG_CMD_MEMTEST
 CMD_TBL_ITEM(
-	mtest,	5,	1,	do_mem_mtest,
+	mtest,	4,	1,	do_mem_mtest,
 	"simple RAM read/write test",
-	"[start [end [pattern [iterations]]]]"
+	"[start [end [iterations]]]"
 ),
 #endif	/* CONFIG_CMD_MEMTEST */
 
@@ -229,7 +247,7 @@ CMD_TBL_ITEM(
 	"address count delay(ms)"
 ),
 CMD_TBL_ITEM(
-	mwc,	4,	1,	do_mem_mwc,
+	mwc,	4,	1,	do_mem_mdc,
 	"memory write cyclic",
 	"address value delay(ms)"
 ),
@@ -254,7 +272,7 @@ CMD_TBL_ITEM(
 	"path"
 ),
 CMD_TBL_ITEM(
-	fatload,	5,	0,	do_fat_read,
+	fatload,	5,	0,	do_fat_rw,
 	"load binary file from a dos filesystem",
 	"<d:/path/filename> <addr> [bytes [pos]]\n"
 	"    - Load binary file 'path/filename' on logical drive 'd'\n"
@@ -265,11 +283,12 @@ CMD_TBL_ITEM(
 	"      the load stops on end of file."
 ),
 CMD_TBL_ITEM(
-	fatwrite,	4,	0,	do_fat_write,
+	fatwrite,	4,	0,	do_fat_rw,
 	"write file into a dos filesystem",
 	"<d:/path/filename> <addr> <bytes>\n"
-	"    - write file 'filename' from the address 'addr' in RAM\n"
-	"      to 'dev' on 'interface'"
+	"    - Write file to 'path/filename' on logical drive 'd' from RAM\n"
+	"      starting at address 'addr'. 'bytes' gives the size to load.\n"
+	"      If 'bytes' is 0 or omitted, the load stops on end of file."
 ),
 
 CMD_TBL_ITEM(