fat commands are now subcommands of a single fat command. Added 'fat cd' and 'fat...

[z180-stamp.git] / avr / command_tbl.c

diff --git a/avr/command_tbl.c b/avr/command_tbl.c
index 7ebc008f804cadc27f31834f4bba90a8bdf15ebf..7e7cceed839f47c38e267f971aacc294d7df3ecd 100644 (file)
--- a/avr/command_tbl.c
+++ b/avr/command_tbl.c
@@ -33,12 +33,10 @@ 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_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_rw(cmd_tbl_t *, int, int, char * const []);
-extern command_ret_t do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
-extern command_ret_t do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
-extern command_ret_t do_attach(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+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[] =
@@ -126,10 +124,10 @@ CMD_TBL_ITEM_COMPLETE(
 CMD_TBL_ITEM_COMPLETE(
        printenv, CONFIG_SYS_MAXARGS,   1,      do_env_print,
        "print environment variables",
-       "\n"
-       "    - print values of all environment variables\n"
-       "printenv name ...\n"
-       "    - print value of environment variable 'name'",
+       "[-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(
@@ -284,7 +282,7 @@ CMD_TBL_ITEM(
        "[-bwl] address value [count]\n"
        "   -b  write value as byte (8 bit, default)\n"
        "   -w  write value as word (16 bit)\n"
-       "   -l  write value as long (32 bit)\n"
+       "   -l  write value as long (32 bit)"
 ),
 CMD_TBL_ITEM(
        cp,     4,      1,      do_mem_cp,
@@ -330,9 +328,12 @@ CMD_TBL_ITEM(
        "address count delay(ms)"
 ),
 CMD_TBL_ITEM(
-       mwc,    4,      1,      do_mem_mdc,
+       mwc,    CONFIG_SYS_MAXARGS,     1,      do_mem_mdc,
        "memory write cyclic",
-       "address value delay(ms)"
+       "[-bwl] address value delay(ms)\n"
+       "   -b  write value as byte (8 bit, default)\n"
+       "   -w  write value as word (16 bit)\n"
+       "   -l  write value as long (32 bit)"
 ),
 #endif /* CONFIG_MX_CYCLIC */
 
@@ -343,44 +344,36 @@ CMD_TBL_ITEM(
        "sd help\n"
        "    - print help on subcommands"
 ),
-
-CMD_TBL_ITEM(
-       fatstat,        2,      1,      do_fat_stat,
-       "Show logical drive status",
-       "dev"
-),
-CMD_TBL_ITEM(
-       fatls,  2,      1,      do_fat_ls,
-       "Directory listing",
-       "path"
-),
 CMD_TBL_ITEM(
-       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"
-       "      to address 'addr' from dos filesystem.\n"
-       "      'pos' gives the file position to start loading from.\n"
-       "      If 'pos' is omitted, 0 is used. 'pos' requires 'bytes'.\n"
-       "      'bytes' gives the size to load. If 'bytes' is 0 or omitted,\n"
-       "      the load stops on end of file."
-),
-CMD_TBL_ITEM(
-       fatwrite,       4,      0,      do_fat_rw,
-       "write file into a dos filesystem",
-       "<d:/path/filename> <addr> <bytes>\n"
-       "    - Write file to 'path/filename' on logical drive 'd' from RAM\n"
-       "      starting at address 'addr'.\n"
+       fat,   CONFIG_SYS_MAXARGS, 1, do_fat,
+       "fat filesystem commands",
+       "<subcommand> args ...\n"
+       "fat help\n"
+       "    - print help on subcommands"
 ),
+
 CMD_TBL_ITEM(
        attach, CONFIG_SYS_MAXARGS,     1,      do_attach,
        "attach filesystem image file to CP/M drive",
-       "[options] [dsk<n> <d:/path/filename>]\n"
-       "    - attach drive number <n> to diskfile <d:/path/filename>\n"
-       "attach -d dsk<n>\n"
-       "    - detach drive\n"
+       "[-rw] [-o options] dsk<n> diskfile\n"
+       "    Attach diskfile to dsk<n>, where n in 0..7\n"
+       "    -r      File is read only (write protected)\n"
+       "    -w      File is read/write (default)\n"
+       "    -o options\n"
+       "            Options is a comma-separated list of\n"
+       "            ro, rw, debug, nodebug\n"
+       "\n"
+       "attach [-rw] -o reattach[,other options] dsk<n>\n"
+       "    Change options for dsk<n>.\n"
+       "    Options as above.\n"
+       "\n"
+       "attach -d -a|dsk<n>\n"
+       "detach -a|dsk<n>\n"
+       "    Detach diskfile from dsk<n>.\n"
+       "    -a      Detach all.\n"
+       "\n"
        "attach\n"
-       "    - without arguments, list current assignments"
+       "    Without arguments, list current assignments\n"
 ),
 CMD_TBL_ITEM(
        detach, 2,      1,      do_attach,