X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/8a2b0da07c62b1ab1d9d2240268fbf71f59421dd..51dd0948df5ed53b11cab4e909e19ee7cee363c5:/avr/command_tbl.c diff --git a/avr/command_tbl.c b/avr/command_tbl.c index 7e7ccee..4ed37b7 100644 --- a/avr/command_tbl.c +++ b/avr/command_tbl.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2014-2016 Leo C. + * (C) Copyright 2014-2016, 2018 Leo C. * * SPDX-License-Identifier: GPL-2.0 */ @@ -7,45 +7,31 @@ #include "common.h" #include "command.h" #include "cmd_mem.h" +#include "cmd_boot.h" +#include "cmd_cpu.h" +#include "cmd_misc.h" +#include "cmd_date.h" +#include "cmd_run.h" +#include "cmd_loadcpm3.h" +#include "cmd_loadihex.h" +#include "cmd_gpio.h" +#include "cmd_sd.h" +#include "cmd_fat.h" +#include "cmd_attach.h" +#include "env.h" +#include "debug.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 []); -extern command_ret_t do_env_print(cmd_tbl_t *, int, int, char * const []); -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_bootcf(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 []); -#if defined(CONFIG_CMD_LOADB) -extern command_ret_t do_load_serial_bin(cmd_tbl_t *, int, int, char * const []); -#endif -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 []); -extern command_ret_t do_dump_mem(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_mem_mm_avr(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_mem_nm_avr(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_eep_cp(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_busreq_pulse(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_date(cmd_tbl_t *, int, int, char * const []); -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(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_run(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_source(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_attach(cmd_tbl_t *, int, int, char * const []); -#ifdef CONFIG_SYS_LONGHELP -const FLASH char sd_help_text[] = - "bla \t- do bla\n" - ; -#endif /* CONFIG_SYS_LONGHELP */ +cmd_tbl_t cmd_tbl[] = { +CMD_TBL_ITEM_TOP( + xx, CONFIG_SYS_MAXARGS, 0, do_cpu, + "experimental commands", + " args ...\n" + "xx help\n", + cmd_tbl_cpu +), -cmd_tbl_t cmd_tbl[] = { CMD_TBL_ITEM( date, 2, 1, do_date, @@ -58,36 +44,51 @@ CMD_TBL_ITEM( #ifdef DEBUG CMD_TBL_ITEM( - !mdr, 3, 1, do_dump_mem, + !mdr, 3, CTBL_DBG|CTBL_RPT, do_dump_mem, "RAM dump", "address [count]" ), CMD_TBL_ITEM( - !mde, 3, 1, do_dump_mem, + !mde, 3, CTBL_DBG|CTBL_RPT, do_dump_mem, "EEPROM dump", "address [count]" ), CMD_TBL_ITEM( - !mdf, 3, 1, do_dump_mem, + !mdf, 3, CTBL_DBG|CTBL_RPT, do_dump_mem, "FLASH dump", "address [count]" ), CMD_TBL_ITEM( - !cpe, 4, 0, do_eep_cp, + !cpe, 4, CTBL_DBG, do_eep_cp, "EEPROM copy", "source target count" ), CMD_TBL_ITEM( - !mm, 2, 1, do_mem_mm_avr, + !mm, 2, CTBL_DBG|CTBL_RPT, do_mem_mm_avr, "avr memory modify (auto-incrementing address)", "address" ), CMD_TBL_ITEM( - !nm, 2, 1, do_mem_nm_avr, + !nm, 2, CTBL_DBG|CTBL_RPT, do_mem_nm_avr, "avr memory modify (constant address)", "address" ), +CMD_TBL_ITEM( + !prfree, 1, CTBL_DBG|CTBL_RPT, do_pr_free_avr, + "print avr heap free list", + "" +), +CMD_TBL_ITEM( + !prheap, 1, CTBL_DBG, do_pr_heap_avr, + "dump avr heap", + "" +), #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", @@ -114,6 +115,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", @@ -121,33 +127,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( @@ -262,22 +247,22 @@ CMD_TBL_ITEM( ), CMD_TBL_ITEM( - md, 3, 1, do_mem_md, + md, 3, CTBL_RPT, do_mem_md, "memory display", "address [# of objects]" ), CMD_TBL_ITEM( - mm, 2, 1, do_mem_mm, + mm, 2, CTBL_RPT, do_mem_mm, "memory modify (auto-incrementing address)", "address" ), CMD_TBL_ITEM( - nm, 2, 1, do_mem_nm, + nm, 2, CTBL_RPT, do_mem_nm, "memory modify (constant address)", "address" ), CMD_TBL_ITEM( - mw, CONFIG_SYS_MAXARGS, 1, do_mem_mw, + mw, CONFIG_SYS_MAXARGS, CTBL_RPT, do_mem_mw, "memory write (fill)", "[-bwl] address value [count]\n" " -b write value as byte (8 bit, default)\n" @@ -285,12 +270,12 @@ CMD_TBL_ITEM( " -l write value as long (32 bit)" ), CMD_TBL_ITEM( - cp, 4, 1, do_mem_cp, + mcp, 4, CTBL_RPT, do_mem_cp, "memory copy", "source target count" ), CMD_TBL_ITEM( - cmp, 4, 1, do_mem_cmp, + mcmp, 4, CTBL_RPT, do_mem_cmp, "memory compare", "addr1 addr2 count" ), @@ -303,19 +288,19 @@ CMD_TBL_ITEM( " - set address offset for memory commands to 'offset'" ), CMD_TBL_ITEM( - mloop, 3, 1, do_mem_loop, + mloop, 3, CTBL_RPT, do_mem_loop, "infinite loop on address range", "address number_of_bytes" ), CMD_TBL_ITEM( - mloopw, 4, 1, do_mem_loopw, + mloopw, 4, CTBL_RPT, do_mem_loopw, "infinite write loop on address range", "address number_of_bytes data_to_write" ), #ifdef CONFIG_CMD_MEMTEST CMD_TBL_ITEM( - mtest, 4, 1, do_mem_mtest, + mtest, 4, CTBL_RPT, do_mem_mtest, "simple RAM read/write test", "[start [end [iterations]]]" ), @@ -323,12 +308,12 @@ CMD_TBL_ITEM( #ifdef CONFIG_MX_CYCLIC CMD_TBL_ITEM( - mdc, 4, 1, do_mem_mdc, + mdc, 4, CTBL_RPT, do_mem_mdc, "memory display cyclic", "address count delay(ms)" ), CMD_TBL_ITEM( - mwc, CONFIG_SYS_MAXARGS, 1, do_mem_mdc, + mwc, CONFIG_SYS_MAXARGS, CTBL_RPT, do_mem_mdc, "memory write cyclic", "[-bwl] address value delay(ms)\n" " -b write value as byte (8 bit, default)\n" @@ -337,26 +322,28 @@ CMD_TBL_ITEM( ), #endif /* CONFIG_MX_CYCLIC */ -CMD_TBL_ITEM( - sd, CONFIG_SYS_MAXARGS, 1, do_sd, +CMD_TBL_ITEM_TOP( + sd, CONFIG_SYS_MAXARGS, 0, do_sd, "SD/MMC card handling commands", " args ...\n" "sd help\n" - " - print help on subcommands" + " - print help on subcommands", + cmd_tbl_sd ), -CMD_TBL_ITEM( - fat, CONFIG_SYS_MAXARGS, 1, do_fat, +CMD_TBL_ITEM_TOP( + fat, CONFIG_SYS_MAXARGS, 0, do_fat, "fat filesystem commands", " args ...\n" "fat help\n" - " - print help on subcommands" + " - print help on subcommands", + cmd_tbl_fat ), CMD_TBL_ITEM( - attach, CONFIG_SYS_MAXARGS, 1, do_attach, + attach, CONFIG_SYS_MAXARGS, CTBL_RPT, do_attach, "attach filesystem image file to CP/M drive", "[-rw] [-o options] dsk diskfile\n" - " Attach diskfile to dsk, where n in 0..7\n" + " Attach diskfile to dsk, 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,22 +360,27 @@ CMD_TBL_ITEM( " -a Detach all.\n" "\n" "attach\n" - " Without arguments, list current assignments\n" + " Without arguments, list current assignments" ), CMD_TBL_ITEM( - detach, 2, 1, do_attach, + detach, 2, 0, do_attach, "detach file from CP/M drive", "dsk]\n" " - alias for 'attach -d dsk'" ), CMD_TBL_ITEM( - help, CONFIG_SYS_MAXARGS, 1, do_help, + 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 */ @@ -397,10 +389,11 @@ CMD_TBL_ITEM( #ifdef CONFIG_SYS_LONGHELP FSTR(""), #endif /* CONFIG_SYS_LONGHELP */ + NULL, #ifdef CONFIG_AUTO_COMPLETE - 0, + NULL, #endif }, /* Mark end of table */ -{ 0 }, +CMD_TBL_END(cmd_tbl) };