X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/cca42593c4ab9e564675d1896caa9a7e794d6fec..c3ce66a888beadf2a6d524101dd009d5acd452ae:/avr/cmd_sd.c diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c index 2ccf024..91007f9 100644 --- a/avr/cmd_sd.c +++ b/avr/cmd_sd.c @@ -1,52 +1,44 @@ +/* + * (C) Copyright 2014 Leo C. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + #include "common.h" -#include +//#include #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" -static const FLASH char * const FLASH rc_names[] = { - FSTR("OK"), - FSTR("DISK_ERR"), - FSTR("INT_ERR"), - FSTR("NOT_READY"), - FSTR("NO_FILE"), - FSTR("NO_PATH"), - FSTR("INVALID_NAME"), - FSTR("DENIED"), - FSTR("EXIST"), - FSTR("INVALID_OBJECT"), - FSTR("WRITE_PROTECTED"), - FSTR("INVALID_DRIVE"), - FSTR("NOT_ENABLED"), - FSTR("NO_FILE_SYSTEM"), - FSTR("MKFS_ABORTED"), - FSTR("TIMEOUT"), - FSTR("LOCKED"), - FSTR("NOT_ENOUGH_CORE"), - FSTR("TOO_MANY_OPEN_FILES") - }; - +/* + * status - Show socket status + * + */ static -void put_rc (FRESULT rc) +command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { -#if 0 - printf_P(PSTR("rc=%u FR_%S\n"), rc, rc_names[rc]); -#else - printf_P(PSTR("rc=%u FR_"), rc); - my_puts_P(rc_names[rc]); - my_puts_P(PSTR("\n")); + DSTATUS res; + BYTE dev; -#endif + (void) cmdtp; (void) flag; -} + if (argc < 2) + return CMD_RET_USAGE; + dev = (BYTE) eval_arg(argv[1], NULL); + res = disk_status(dev); + printf_P(PSTR("Socket status: %02x\n"), res); + + return CMD_RET_SUCCESS; +} /* - * di - Initialize disk + * init - Initialize disk * */ static @@ -60,28 +52,30 @@ 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); - res = disk_status(dev); - printf_P(PSTR("disk_status=%.2x\n"), res); + dev = (BYTE) eval_arg(argv[1], NULL); - if ((res & STA_NODISK) == 0) { - res = disk_initialize(dev); + if (disk_status(dev) & STA_NODISK) { + printf_P(PSTR("No Disk\n")); + return CMD_RET_FAILURE; } + + res = disk_initialize(dev); printf_P(PSTR("rc=%.2x\n"), res); - if (res) { + + if (res & (STA_NODISK | STA_NOINIT)) return CMD_RET_FAILURE; - } return CMD_RET_SUCCESS; } /* - * ds - Show disk status + * info - Show disk info * */ static -command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_info(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { + DSTATUS res; BYTE dev; union { @@ -95,38 +89,30 @@ 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); + if (res & (STA_NODISK | STA_NOINIT)) { + printf_P(res & STA_NODISK ? + PSTR("No disk\n") : PSTR("Not initialized\n")); + return CMD_RET_FAILURE; + } if (disk_ioctl(dev, GET_SECTOR_COUNT, &dat.ul) == RES_OK) printf_P(PSTR("Drive size: %lu sectors\n"), dat.ul); - if (disk_ioctl(dev, GET_BLOCK_SIZE, &dat.ul) == RES_OK) printf_P(PSTR("Erase block: %lu sectors\n"), dat.ul); - if (disk_ioctl(dev, MMC_GET_TYPE, &dat.uc) == RES_OK) printf_P(PSTR("Card type: %u\n"), dat.uc); - if (disk_ioctl(dev, MMC_GET_CSD, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 16, "CSD:"); - if (disk_ioctl(dev, MMC_GET_CID, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 16, "CID:"); - if (disk_ioctl(dev, MMC_GET_OCR, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 4, "OCR:"); - if (disk_ioctl(dev, MMC_GET_SDSTAT, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 64, "SD Status:"); - if (disk_ioctl(dev, ATA_GET_MODEL, dat.uca) == RES_OK) { - dat.uca[40] = '\0'; - printf_P(PSTR("Model: %s\n"), dat.uca); - } - if (disk_ioctl(dev, ATA_GET_SN, dat.uca) == RES_OK) { - dat.uca[20] = '\0'; printf_P(PSTR("S/N: %s\n"), dat.uca); - } - return CMD_RET_SUCCESS; } @@ -140,7 +126,7 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, int 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; @@ -153,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; @@ -162,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++) { @@ -176,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; @@ -196,7 +182,7 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) 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; @@ -206,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; @@ -214,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;) { @@ -228,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; } @@ -258,7 +244,7 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] 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; @@ -268,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; @@ -276,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;) { @@ -289,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); @@ -310,7 +296,7 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] /* * Disk ioctl - * dcs - CTRL_SYNC + * sync - CTRL_SYNC * */ static @@ -323,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; @@ -334,40 +320,45 @@ static command_ret_t do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); cmd_tbl_t cmd_sd_sub[] = { +CMD_TBL_ITEM( + status, 2, 1, do_status, + "Socket staus", + "drive" +), CMD_TBL_ITEM( init, 2, 1, do_init, "Initialize disk", - "" + "drive" ), CMD_TBL_ITEM( - status, 2, 1, do_status, - "Disk status", - "" + info, 2, 1, do_info, + "Disk info", + "drive" ), CMD_TBL_ITEM( dump, CONFIG_SYS_MAXARGS, 1, do_dump, - "Dump sector", - "" + "Dump sector(s)", + "drive [sector [count ]]" ), CMD_TBL_ITEM( read, 2, 1, do_read, - "read disk sector(s) into meomory", + "Read disk sector(s) into meomory", "drive [sector [count [memaddr]]]" ), CMD_TBL_ITEM( write, 2, 1, do_write, - "write sector(s) from meomory to disk", + "Write sector(s) from meomory to disk", "drive [sector [count [memaddr]]]" ), CMD_TBL_ITEM( sync, 2, 1, do_ioctl_sync, "Device control: SYNC", - "" + "drive" ), CMD_TBL_ITEM( help, CONFIG_SYS_MAXARGS, 1, do_help, - "print sub command description/usage", + "Print sub command description/usage", "\n" " - print brief description of all sub commands\n" "sd help command ...\n" @@ -376,7 +367,7 @@ CMD_TBL_ITEM( /* This does not use the CMD_TBL_ITEM macro as ? can't be used in symbol names */ {FSTR("?"), CONFIG_SYS_MAXARGS, 1, do_help, - FSTR("alias for 'help'"), + FSTR("Alias for 'help'"), #ifdef CONFIG_SYS_LONGHELP FSTR(""), #endif /* CONFIG_SYS_LONGHELP */