Merge branch 'fatfs-integration' into fatcommands

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

diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c
index e2adbe795e678e579e2c972b5288f713c6c206ca..06c933852cb1f5df1ce8885bbcaea12a35f89ab6 100644 (file)
--- a/avr/cmd_sd.c
+++ b/avr/cmd_sd.c
@@ -124,7 +124,7 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons
 {
        static BYTE dev_last;
        static  DWORD sec_last;
-       BYTE buffer[_MAX_SS];
+       BYTE buffer[FF_MAX_SS];
        char header[20];
 
        DRESULT res;
@@ -160,7 +160,7 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons
                }
 
                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;
@@ -180,7 +180,7 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons
        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;
@@ -212,9 +212,9 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons
                                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;
        }
@@ -242,7 +242,7 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * con
        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;
@@ -273,13 +273,13 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * con
                        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);
@@ -316,43 +316,43 @@ command_ret_t do_ioctl_sync(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char
 
 cmd_tbl_t cmd_tbl_sd[] = {
 CMD_TBL_ITEM(
-       status, 2,                      CTBL_REPEAT,    do_status,
+       status, 2,                      CTBL_RPT,       do_status,
        "Socket staus",
        "drive"
 ),
 CMD_TBL_ITEM(
-       init,   2,                      CTBL_REPEAT,    do_init,
+       init,   2,                      CTBL_RPT,       do_init,
        "Initialize disk",
        "drive"
 ),
 CMD_TBL_ITEM(
-       info,   2,                      CTBL_REPEAT,    do_info,
+       info,   2,                      CTBL_RPT,       do_info,
        "Disk info",
        "drive"
 ),
 CMD_TBL_ITEM(
-       dump,   CONFIG_SYS_MAXARGS,     CTBL_REPEAT,    do_dump,
+       dump,   CONFIG_SYS_MAXARGS,     CTBL_RPT,       do_dump,
        "Dump sector(s)",
        "drive [sector [count ]]"
 ),
 CMD_TBL_ITEM(
-       read,   2,                      CTBL_REPEAT,    do_read,
+       read,   2,                      CTBL_RPT,       do_read,
        "Read disk sector(s) into meomory",
        "drive [sector [count [memaddr]]]"
 ),
 CMD_TBL_ITEM(
-       write,  2,                      CTBL_REPEAT,    do_write,
+       write,  2,                      CTBL_RPT,       do_write,
        "Write sector(s) from meomory to disk",
        "drive [sector [count [memaddr]]]"
 ),
 CMD_TBL_ITEM(
-       sync,   2,                      CTBL_REPEAT,    do_ioctl_sync,
+       sync,   2,                      CTBL_RPT,       do_ioctl_sync,
        "Device control: SYNC",
        "drive"
 ),
 
 CMD_TBL_ITEM(
-       help,   CONFIG_SYS_MAXARGS,     CTBL_REPEAT,    do_help,
+       help,   CONFIG_SYS_MAXARGS,     CTBL_RPT,       do_help,
        "Print sub command description/usage",
        "\n"
        "       - print brief description of all sub commands\n"
@@ -378,6 +378,6 @@ CMD_TBL_END(cmd_tbl_sd)
 
 command_ret_t do_sd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
-       puts_P("Huch?");
+       puts_P(PSTR("Huch?"));
        return CMD_RET_USAGE;
 }