X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/7a1ed62033184b79388b541258a14bc579389bdb..f66d9570ec64ecaa1f879619a0e4fed8d5fa7803:/avr/command_tbl.c?ds=sidebyside

diff --git a/avr/command_tbl.c b/avr/command_tbl.c
index 5e2d1d0..5d185ba 100644
--- a/avr/command_tbl.c
+++ b/avr/command_tbl.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2014-2016 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014-2016, 2018 Leo C. <erbl259-lmu@yahoo.de>
  *
  * SPDX-License-Identifier:	GPL-2.0
  */
@@ -74,6 +74,11 @@ CMD_TBL_ITEM(
 	""
 ),
 #endif
+CMD_TBL_ITEM(
+	msize,	1,	1,	do_mem_size,
+	"Detect memory size",
+	""
+),
 CMD_TBL_ITEM(
 	mstep,	2,	1,	do_busreq_pulse,
 	"execute one M cycle",
@@ -100,6 +105,11 @@ CMD_TBL_ITEM_COMPLETE(
 	"    - run the commands in the environment variable(s) 'var'",
 	var_complete
 ),
+CMD_TBL_ITEM(
+	boot,	1,	1,	do_bootd,
+	"boot default, i.e., run 'bootcmd'",
+	""
+),
 CMD_TBL_ITEM_COMPLETE(
 	source,	CONFIG_SYS_MAXARGS,	1,	do_source,
 	"run commands from a file",
@@ -107,33 +117,12 @@ CMD_TBL_ITEM_COMPLETE(
 	"    - run the commands in the script file 'filename'",
 	var_complete
 ),
-CMD_TBL_ITEM_COMPLETE(
-	printenv, CONFIG_SYS_MAXARGS,	1,	do_env_print,
-	"print environment variables",
-	"[-s] [name ...]\n"
-	"    Print value of environment variable(s) 'name'\n"
-	"    If no names are given, print values of all environment variables\n"
-	"    -s Print in setenv form",
-	var_complete
-),
-CMD_TBL_ITEM_COMPLETE(
-	setenv, CONFIG_SYS_MAXARGS,	0,	do_env_set,
-	"set environment variables",
-	"name value ...\n"
-	"    - set environment variable 'name' to 'value ...'\n"
-	"setenv name\n"
-	"    - delete environment variable 'name'",
-	var_complete
-),
-CMD_TBL_ITEM(
-	saveenv,	1,	0,	do_env_save,
-	"save environment variables to persistent storage",
-	""
-),
-CMD_TBL_ITEM(
-	defaultenv,	1,	0,	do_env_default,
-	"set all environment variables to their default values",
-	""
+
+CMD_TBL_ITEM_TOP(
+	env, CONFIG_SYS_MAXARGS, 0, do_env,
+	"environment handling commands",
+	"",
+	cmd_tbl_env
 ),
 
 CMD_TBL_ITEM(
@@ -271,12 +260,12 @@ CMD_TBL_ITEM(
 	"   -l  write value as long (32 bit)"
 ),
 CMD_TBL_ITEM(
-	cp,	4,	CTBL_RPT,	do_mem_cp,
+	mcp,	4,	CTBL_RPT,	do_mem_cp,
 	"memory copy",
 	"source target count"
 ),
 CMD_TBL_ITEM(
-	cmp,	4,	CTBL_RPT,	do_mem_cmp,
+	mcmp,	4,	CTBL_RPT,	do_mem_cmp,
 	"memory compare",
 	"addr1 addr2 count"
 ),
@@ -324,7 +313,7 @@ CMD_TBL_ITEM(
 #endif /* CONFIG_MX_CYCLIC */
 
 CMD_TBL_ITEM_TOP(
-	sd,   CONFIG_SYS_MAXARGS, CTBL_SUBCMDAUTO, do_sd,
+	sd,   CONFIG_SYS_MAXARGS, 0, do_sd,
 	"SD/MMC card handling commands",
 	"<subcommand> args ...\n"
 	"sd help\n"
@@ -332,7 +321,7 @@ CMD_TBL_ITEM_TOP(
 	cmd_tbl_sd
 ),
 CMD_TBL_ITEM_TOP(
-	fat,   CONFIG_SYS_MAXARGS, CTBL_SUBCMD|CTBL_SUBCMDAUTO, do_fat,
+	fat,   CONFIG_SYS_MAXARGS, 0, do_fat,
 	"fat filesystem commands",
 	"<subcommand> args ...\n"
 	"fat help\n"
@@ -344,7 +333,7 @@ CMD_TBL_ITEM(
 	attach,	CONFIG_SYS_MAXARGS,	CTBL_RPT,	do_attach,
 	"attach filesystem image file to CP/M drive",
 	"[-rw] [-o options] dsk<n> diskfile\n"
-	"    Attach diskfile to dsk<n>, where n in 0..7\n"
+	"    Attach diskfile to dsk<n>, where n in 0.."CONFIG_CPM_MAX_DRNR_STR"\n"
 	"    -r      File is read only (write protected)\n"
 	"    -w      File is read/write (default)\n"
 	"    -o options\n"
@@ -373,10 +362,15 @@ CMD_TBL_ITEM(
 CMD_TBL_ITEM(
 	help,	CONFIG_SYS_MAXARGS,	0,	do_help,
 	"print command description/usage",
-	"\n"
-	"       - print brief description of all commands\n"
-	"help command ...\n"
-	"       - print detailed usage of 'command'"
+	"[-a]\n"
+	"    print brief description of all commands\n"
+	"    -a    print description of subcommands too\n"
+	"help -fk keyword ...\n"
+	"    print brief description of commands matching keyword\n"
+	"    -f    search keyword in command name\n"
+	"    -k    search keyword in command name and description\n"
+	"help [-a] command ...\n"
+	"    print detailed usage of 'command'"
 ),
 
 /* This does not use the CMD_TBL_ITEM macro as ? can't be used in symbol names */