+/*
+ * (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"
/*
- * di <pd#> - Initialize disk
+ * status <pd#> - Show socket status
*
*/
static
-command_ret_t do_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
DSTATUS res;
BYTE dev;
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("disk_status=%.2x\n"), res);
+ printf_P(PSTR("Socket status: %02x\n"), res);
+
+ return CMD_RET_SUCCESS;
+}
+
+/*
+ * init <pd#> - Initialize disk
+ *
+ */
+static
+command_ret_t do_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ DSTATUS res;
+ BYTE dev;
- if ((res & STA_NODISK) == 0) {
- res = disk_initialize(dev);
+ (void) cmdtp; (void) flag;
+
+ if (argc < 2)
+ return CMD_RET_USAGE;
+
+ dev = (BYTE) eval_arg(argv[1], NULL);
+
+ 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 <pd#> - Show disk status
+ * info <pd#> - 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 {
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);
{
static BYTE dev_last;
static DWORD sec_last;
- BYTE buffer[_MAX_SS];
+ BYTE buffer[FF_MAX_SS];
char header[20];
DRESULT res;
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;
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++) {
}
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;
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;
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;
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;) {
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;
}
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;
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;
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;) {
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);
/*
* Disk ioctl
- *
dcs <pd#> - CTRL_SYNC
+ *
sync <pd#> - CTRL_SYNC
*
*/
static
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;
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"
/* 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 */
projects / z180-stamp.git / blobdiff