commandtable, flags: int --> uint8_t/uint_fast8_t. Macro UNUSED for Parameters/Variables

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

diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c
index 46dbcfdc3ff30619f80f1593338e9a2a5a59a839..9d6e5cadbf7b29fd1f63a567918e754fb7e6a511 100644 (file)
--- a/avr/cmd_sd.c
+++ b/avr/cmd_sd.c
@@ -1,11 +1,18 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
 #include "common.h"
-#include <stdlib.h>
+//#include <stdlib.h>
 
 #include "command.h"
 #include "diskio.h"
 #include "ff.h"
-#include "z80-if.h"
+#include "eval_arg.h"
 #include "print-utils.h"
+#include "z80-if.h"
 
 
 /*
@@ -13,7 +20,7 @@
  *
  */
 static
-command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_status(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        DSTATUS res;
        BYTE dev;
@@ -23,7 +30,7 @@ command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       dev = (BYTE) strtoul(argv[1], 0, 10);
+       dev = (BYTE) eval_arg(argv[1], NULL);
        res = disk_status(dev);
        printf_P(PSTR("Socket status: %02x\n"), res);
 
@@ -35,7 +42,7 @@ command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
  *
  */
 static
-command_ret_t do_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_init(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        DSTATUS res;
        BYTE dev;
@@ -45,7 +52,7 @@ command_ret_t do_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       dev = (BYTE) strtoul(argv[1], 0, 10);
+       dev = (BYTE) eval_arg(argv[1], NULL);
 
        if (disk_status(dev) & STA_NODISK) {
                printf_P(PSTR("No Disk\n"));
@@ -66,7 +73,7 @@ command_ret_t do_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  *
  */
 static
-command_ret_t do_info(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_info(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        DSTATUS res;
        BYTE dev;
@@ -82,7 +89,7 @@ command_ret_t do_info(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       dev = (BYTE) strtoul(argv[1], 0, 10);
+       dev = (BYTE) eval_arg(argv[1], NULL);
 
        res = disk_status(dev);
        if (res & (STA_NODISK | STA_NOINIT)) {
@@ -115,11 +122,11 @@ command_ret_t do_info(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  *
  */
 static
-command_ret_t do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_dump(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        static BYTE dev_last;
        static  DWORD sec_last;
-       BYTE buffer[_MAX_SS];
+       BYTE buffer[FF_MAX_SS];
        char header[20];
 
        DRESULT res;
@@ -132,7 +139,7 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       dev = (BYTE) strtoul(argv[1], NULL, 10);
+       dev = (BYTE) eval_arg(argv[1], NULL);
        if (dev != dev_last)
                sec_last = 0;
        sec = sec_last;
@@ -141,9 +148,9 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if ((flag & CMD_FLAG_REPEAT) == 0) {
                /* If another parameter, it is the sector to dump. */
                if (argc > 2)
-                       sec = strtoul(argv[2], 0, 10);
+                       sec = eval_arg(argv[2], NULL);
                if (argc > 3)
-                       count = (UINT) strtoul(argv[3], 0, 10);
+                       count = (UINT) eval_arg(argv[3], NULL);
        }
 
        for ( ; count; count--, sec++) {
@@ -155,7 +162,7 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                }
 
                sprintf_P(header, PSTR("Sector: %lu"), sec);
-               dump_ram(buffer, 0, _MAX_SS, header);
+               dump_ram(buffer, 0, FF_MAX_SS, header);
        }
        dev_last = dev;
        sec_last = sec;
@@ -168,14 +175,14 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  *
  */
 static
-command_ret_t do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_read(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        DRESULT res;
        BYTE dev;
        DWORD sec;
        uint32_t addr;
        int count, nr;
-       BYTE buffer[_MAX_SS];
+       BYTE buffer[FF_MAX_SS];
 
        static DWORD sec_last;
        static uint32_t addr_last;
@@ -185,7 +192,7 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       dev = (BYTE) strtoul(argv[1], NULL, 10);
+       dev = (BYTE) eval_arg(argv[1], NULL);
        sec = sec_last;
        count = 1;
        addr = addr_last;
@@ -193,11 +200,11 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if ((flag & CMD_FLAG_REPEAT) == 0) {
                /* If another parameter, it is the sector to dump. */
                if (argc > 2)
-                       sec = strtoul(argv[2], 0, 10);
+                       sec = eval_arg(argv[2], NULL);
                if (argc > 3)
-                       count = strtoul(argv[3], 0, 10);
+                       count = eval_arg(argv[3], NULL);
                if (argc > 4)
-                       addr = strtoul(argv[4], 0, 16);
+                       addr = eval_arg(argv[4], NULL);
        }
 
        for (nr = 0; nr < count;) {
@@ -207,9 +214,9 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                my_puts_P(PSTR("Bus timeout\n"));
                                return  CMD_RET_FAILURE;
                        }
-                       z80_write_block(buffer, addr /*+ base*/, _MAX_SS);
+                       z80_write_block(buffer, addr /*+ base*/, FF_MAX_SS);
                        z80_bus_cmd(Release);
-                       sec++; addr += _MAX_SS;
+                       sec++; addr += FF_MAX_SS;
                } else
                        break;
        }
@@ -230,14 +237,14 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  *
  */
 static
-command_ret_t do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_write(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        DRESULT res;
        BYTE dev;
        DWORD sec;
        uint32_t addr;
        int count, nr;
-       BYTE buffer[_MAX_SS];
+       BYTE buffer[FF_MAX_SS];
 
        static DWORD sec_last;
        static uint32_t addr_last;
@@ -247,7 +254,7 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       dev = (BYTE) strtoul(argv[1], NULL, 10);
+       dev = (BYTE) eval_arg(argv[1], NULL);
        sec = sec_last;
        addr = addr_last;
        count = 1;
@@ -255,11 +262,11 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        if ((flag & CMD_FLAG_REPEAT) == 0) {
                /* If another parameter, it is the sector to dump. */
                if (argc > 2)
-                       sec = strtoul(argv[2], 0, 10);
+                       sec = eval_arg(argv[2], NULL);
                if (argc > 3)
-                       count = strtoul(argv[3], 0, 10);
+                       count = eval_arg(argv[3], NULL);
                if (argc > 4)
-                       addr = strtoul(argv[4], 0, 16);
+                       addr = eval_arg(argv[4], NULL);
        }
 
        for (nr = 0; nr < count;) {
@@ -268,13 +275,13 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
                        my_puts_P(PSTR("Bus timeout\n"));
                        return  CMD_RET_FAILURE;
                }
-               z80_read_block(buffer, addr /*+ base*/, _MAX_SS);
+               z80_read_block(buffer, addr /*+ base*/, FF_MAX_SS);
                z80_bus_cmd(Release);
 
                res = disk_write(dev, buffer, sec, 1);
                if (res != RES_OK)
                        break;
-               sec++; addr += _MAX_SS;
+               sec++; addr += FF_MAX_SS;
        }
 
        printf_P(PSTR("%d sector(s) written, rc=%.2x.\n"), nr, res);
@@ -293,7 +300,7 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
  *
  */
 static
-command_ret_t do_ioctl_sync(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_ioctl_sync(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        BYTE dev;
 
@@ -302,7 +309,7 @@ command_ret_t do_ioctl_sync(cmd_tbl_t *cmdtp, int flag, int argc, char * const a
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       dev = (BYTE) strtoul(argv[1], 0, 10);
+       dev = (BYTE) eval_arg(argv[1], NULL);
        printf_P(PSTR("rc=%.2x\n"), disk_ioctl(dev, CTRL_SYNC, 0));
 
        return CMD_RET_SUCCESS;
@@ -310,47 +317,47 @@ command_ret_t do_ioctl_sync(cmd_tbl_t *cmdtp, int flag, int argc, char * const a
 
 
 static
-command_ret_t do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]);
 
 cmd_tbl_t cmd_sd_sub[] = {
 CMD_TBL_ITEM(
-       status, 2,                      1,      do_status,
+       status, 2,                      CTBL_REPEAT,    do_status,
        "Socket staus",
-       ""
+       "drive"
 ),
 CMD_TBL_ITEM(
-       init,   2,                      1,      do_init,
+       init,   2,                      CTBL_REPEAT,    do_init,
        "Initialize disk",
-       ""
+       "drive"
 ),
 CMD_TBL_ITEM(
-       info,   2,                      1,      do_info,
+       info,   2,                      CTBL_REPEAT,    do_info,
        "Disk info",
-       ""
+       "drive"
 ),
 CMD_TBL_ITEM(
-       dump,   CONFIG_SYS_MAXARGS,     1,      do_dump,
+       dump,   CONFIG_SYS_MAXARGS,     CTBL_REPEAT,    do_dump,
        "Dump sector(s)",
-       "<drive> [sector [count ]]"
+       "drive [sector [count ]]"
 ),
 CMD_TBL_ITEM(
-       read,   2,                      1,      do_read,
+       read,   2,                      CTBL_REPEAT,    do_read,
        "Read disk sector(s) into meomory",
-       "<drive> [sector [count [memaddr]]]"
+       "drive [sector [count [memaddr]]]"
 ),
 CMD_TBL_ITEM(
-       write,  2,                      1,      do_write,
+       write,  2,                      CTBL_REPEAT,    do_write,
        "Write sector(s) from meomory to disk",
-       "<drive> [sector [count [memaddr]]]"
+       "drive [sector [count [memaddr]]]"
 ),
 CMD_TBL_ITEM(
-       sync,   2,                      1,      do_ioctl_sync,
+       sync,   2,                      CTBL_REPEAT,    do_ioctl_sync,
        "Device control: SYNC",
-       ""
+       "drive"
 ),
 
 CMD_TBL_ITEM(
-       help,   CONFIG_SYS_MAXARGS,     1,      do_help,
+       help,   CONFIG_SYS_MAXARGS,     CTBL_REPEAT,    do_help,
        "Print sub command description/usage",
        "\n"
        "       - print brief description of all sub commands\n"
@@ -371,13 +378,13 @@ CMD_TBL_ITEM(
 };
 
 static
-command_ret_t do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        return _do_help(cmd_sd_sub, ARRAY_SIZE(cmd_sd_sub), cmdtp, flag, argc, argv);
 }
 
 
-command_ret_t do_sd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_sd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
        cmd_tbl_t *cp;