*/
#include "cmd_fat.h"
+#include <ctype.h>
#include "ff.h"
#include "z80-if.h"
#include "debug.h"
#include "env.h"
-
#define DEBUG_FA 0 /* set to 1 to debug */
#define debug_fa(fmt, args...) \
/* TODO: use memory size test function (detect_ramsize() in cmd_loadihex.c) */
/* TODO: detect_ramsize() should be moved to z80-if.c */
#define MAX_MEMORY CONFIG_SYS_RAMSIZE_MAX
-#define BUFFER_SIZE 512
+#define BUFFER_SIZE FF_MAX_SS
+#define PATH_MAX CONFIG_SYS_MAX_PATHLEN
+
/*
* Multible (fat) partitions per physical drive are not supported,
FATFS FatFs0;
FATFS FatFs1;
+command_ret_t command_ret;
+char *cmdname;
+
+
void setup_fatfs(void)
{
f_mount(&FatFs0, "0:", 0);
}
-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"),
- FSTR("INVALID_PARAMETER")
+static const FLASH char * const FLASH rc_strings[] = {
+ FSTR("Success"),
+ FSTR("Disk error"),
+ FSTR("Internal error"),
+ 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"),
+ FSTR("Invalid parameter")
};
-static
-void put_rc (FRESULT rc)
+
+
+const FLASH char * fat_rctostr(FRESULT rc)
{
-#if GCC_BUG_61443
- printf_P(PSTR("rc=%u FR_"), rc);
- my_puts_P(rc < ARRAY_SIZE(rc_names) ? rc_names[rc] : PSTR(" Unknown Error"));
- my_puts_P(PSTR("\n"));
-#else
- printf_P(PSTR("rc=%u FR_%S\n"), rc,
- rc < ARRAY_SIZE(rc_names) ? rc_names[rc] : PSTR(" Unknown Error"));
-#endif
+ return rc < ARRAY_SIZE(rc_strings) ? rc_strings[rc] : PSTR(" Unknown Error");
}
-
static void swirl(void)
{
static const FLASH char swirlchar[] = { '-','\\','|','/' };
}
}
+typedef struct {
+ char *p_end; /* pointer to NULL at end of path */
+ char p_path[PATH_MAX + 1]; /* pointer to the start of a path */
+} PATH_T;
+
+
+static char *path_skip_heading(char *p)
+{
+ if (isdigit(p[0]) && p[1] == ':') {
+ p += 2;
+ } else {
+ char *q = p;
+ if (*q++ == '.') {
+ if (*q == '.')
+ ++q;
+ if (*q == '\0' || *q == '/')
+ p = q;
+ }
+ return p;
+ }
+ if (*p == '/')
+ ++p;
+
+ return p;
+}
+
+static void strip_trailing_slash(PATH_T *p)
+{
+ char *beg = path_skip_heading(p->p_path);
+ char *end = p->p_end;
+
+ while (end > beg && end[-1] == '/')
+ *--end = '\0';
+
+ p->p_end =end;
+}
+
+/*
+ * Move specified string into path. Convert "" to "." to handle BSD
+ * semantics for a null path. Strip trailing slashes.
+ */
+static PATH_T *path_setup(char *string)
+{
+ if (strlen(string) > PATH_MAX) {
+ cmd_error(0, 0, PSTR("'%s': Name too long"), string);
+ return NULL;
+ }
+
+ PATH_T *p = (PATH_T *) malloc(sizeof *p);
+ if (p == NULL) {
+ cmd_error(0, ENOMEM, NULL);
+ return NULL;
+ }
+
+ strcpy(p->p_path, string);
+ size_t len = strlen(string);
+ if (len > 1 && p->p_path[1] == ':' && p->p_path[2] != '/') {
+ if (len < PATH_MAX) {
+ memmove(p->p_path+3, p->p_path+2, len-1);
+ p->p_path[2] = '/';
+ len += 1;
+ } else {
+ cmd_error(0, ENOMEM, NULL);
+ return NULL;
+ }
+ }
+
+ p->p_end = p->p_path + len;
+ if (p->p_path == p->p_end) {
+ *p->p_end++ = '.';
+ *p->p_end = '\0';
+ }
+
+ strip_trailing_slash(p);
+ return p;
+}
+
/*
* pwd - Print current directory of the current drive.
*
FRESULT res;
char *buf;
- buf = (char *) malloc(BUFFER_SIZE);
- if (buf == NULL) {
- printf_P(PSTR("pwd: Out of Memory!\n"));
- return CMD_RET_FAILURE;
- }
+ buf = (char *) malloc(PATH_MAX);
+ if (buf == NULL)
+ cmd_error(CMD_RET_FAILURE, ENOMEM, NULL);
+ *buf = '\0';
+ res = f_getcwd(buf, PATH_MAX); /* Get current directory path */
- res = f_getcwd(buf, BUFFER_SIZE); /* Get current directory path */
debug_fa("### f_getcwd(): buf: '%s', res: %d\n", buf, res);
if (res == FR_OK) {
puts(buf);
}
free(buf);
- if (res != FR_OK) {
- put_rc(res);
- return CMD_RET_FAILURE;
- }
+ if (res != FR_OK)
+ cmd_error(CMD_RET_FAILURE, res, NULL);
+
return CMD_RET_SUCCESS;
}
command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
{
char *arg;
- FRESULT res = 0;
+ FRESULT res = FR_OK;
if (argc < 2) {
arg = getenv_str(PSTR(ENV_HOME));
if (arg == NULL) {
- printf_P(PSTR("%s: \"%S\" is not set\n"), argv[0], PSTR(ENV_HOME));
- return CMD_RET_FAILURE;
+ cmd_error(CMD_RET_FAILURE, 0, PSTR("\"%S\" is not set"), PSTR(ENV_HOME));
}
} else
arg = argv[1];
- if (strlen(arg) > 1 && arg[1] == ':') {
- res = f_chdrive(arg);
- debug_fa("### f_chdrive(): arg: '%s', res: %d\n", arg, res);
- if (arg[2] == '\0') {
- arg[0] = '/';
- arg[1] = '\0';
- }
+ PATH_T *path = path_setup(arg);
+ if (path == NULL)
+ return CMD_RET_FAILURE;
+
+ if (strlen(path->p_path) > 1 && path->p_path[1] == ':') {
+ res = f_chdrive(path->p_path);
+ debug_fa("### f_chdrive(): p_path: '%s', res: %d\n", path->p_path, res);
}
if (res == FR_OK) {
- res = f_chdir(arg);
- debug_fa("### f_chdir(): arg: '%s', res: %d\n", arg, res);
- }
- if (res != FR_OK) {
- put_rc(res);
- return CMD_RET_FAILURE;
+ res = f_chdir(path->p_path);
+ debug_fa("### f_chdir(): p_path: '%s', res: %d\n", path->p_path, res);
}
+ free(path);
+ if (res != FR_OK)
+ cmd_error(CMD_RET_FAILURE, res, NULL);
+
return CMD_RET_SUCCESS;
}
char *buf;
- buf = (char *) malloc(BUFFER_SIZE);
- if (buf == NULL) {
- printf_P(PSTR("pwd: Out of Memory!\n"));
- free(buf);
- return CMD_RET_FAILURE;
- }
+ buf = (char *) malloc(PATH_MAX);
+ if (buf == NULL)
+ cmd_error(CMD_RET_FAILURE, ENOMEM, NULL);
if (argc < 2)
- res = f_getcwd(buf, BUFFER_SIZE); /* Get current directory path */
+ res = f_getcwd(buf, PATH_MAX); /* Get current directory path */
else
- strncpy(buf, argv[1], BUFFER_SIZE);
+ strncpy(buf, argv[1], PATH_MAX);
if (res == FR_OK)
res = f_opendir(&Dir, buf);
if (res != FR_OK) {
free(buf);
- put_rc(res);
- return CMD_RET_FAILURE;
+ cmd_error(CMD_RET_FAILURE, res, NULL);
}
p1 = s1 = s2 = 0;
}
free(buf);
- if (res) {
- put_rc(res);
- return CMD_RET_FAILURE;
- }
+ if (res)
+ cmd_error(CMD_RET_FAILURE, res, NULL);
return CMD_RET_SUCCESS;
}
char *path = "";
struct stat_dat_s statp;
- buf = (char *) malloc(BUFFER_SIZE);
- if (buf == NULL) {
- printf_P(PSTR("fat stat: Out of Memory!\n"));
- return CMD_RET_FAILURE;
- }
+ buf = (char *) malloc(PATH_MAX);
+ if (buf == NULL)
+ cmd_error(CMD_RET_FAILURE, ENOMEM, NULL);
if (argc > 1)
path = argv[1];
}
free(buf);
- if (res) {
- put_rc(res);
- return CMD_RET_FAILURE;
- }
+ if (res)
+ cmd_error(CMD_RET_FAILURE, res, NULL);
+
return CMD_RET_SUCCESS;
}
return CMD_RET_USAGE;
addr = eval_arg(argv[2], NULL);
- if (addr >= MAX_MEMORY) {
- printf_P(PSTR("address too high: 0x%0lx\n"), addr);
- return CMD_RET_FAILURE;
- }
+ if (addr >= MAX_MEMORY)
+ cmd_error(CMD_RET_FAILURE, 0, PSTR("Address too high: %#lx"), addr);
+
if (argc > 3)
bytes = eval_arg(argv[3], NULL);
else
bytes = MAX_MEMORY - addr;
buffer = (uint8_t *) malloc(BUFFER_SIZE);
- if (buffer == NULL) {
- printf_P(PSTR("fatstat: Out of Memory!\n"));
- free(buffer);
- return CMD_RET_FAILURE;
- }
+ if (buffer == NULL)
+ cmd_error(CMD_RET_FAILURE, ENOMEM, NULL);
- if (!res) {
- res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS
- : FA_READ );
+ res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS
+ : FA_READ );
+ if (!res) {
+ res = f_lseek(&File, pos);
if (!res) {
- res = f_lseek(&File, pos);
- if (!res) {
- bytes_rw = 0;
- timer = get_timer(0);
- while (bytes) {
- unsigned int cnt, br;
-
- if (bytes >= BUFFER_SIZE) {
- cnt = BUFFER_SIZE;
- bytes -= BUFFER_SIZE;
- } else {
- cnt = bytes; bytes = 0;
- }
- if (dowrite) {
- if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
- buserr = 1;
- break;
- }
- z80_read_block(buffer, addr, cnt);
- z80_bus_cmd(Release);
- res = f_write(&File, buffer, cnt, &br);
- if (res != FR_OK)
- break;
- } else {
- res = f_read(&File, buffer, cnt, &br);
- if (res != FR_OK)
- break;
- if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
- buserr = 1;
- break;
- }
- z80_write_block(buffer, addr, br);
- z80_bus_cmd(Release);
- }
- addr += br;
-
- bytes_rw += br;
- if (cnt != br) {
- if (dowrite)
- printf_P(PSTR("Disk full?\n"));
+ bytes_rw = 0;
+ timer = get_timer(0);
+ while (bytes) {
+ unsigned int cnt, br;
+
+ if (bytes >= BUFFER_SIZE) {
+ cnt = BUFFER_SIZE;
+ bytes -= BUFFER_SIZE;
+ } else {
+ cnt = bytes; bytes = 0;
+ }
+ if (dowrite) {
+ if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
+ buserr = 1;
break;
}
- if (check_abort())
+ z80_read_block(buffer, addr, cnt);
+ z80_bus_cmd(Release);
+ res = f_write(&File, buffer, cnt, &br);
+ if (res != FR_OK)
break;
+ } else {
+ res = f_read(&File, buffer, cnt, &br);
+ if (res != FR_OK)
+ break;
+ if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
+ buserr = 1;
+ break;
+ }
+ z80_write_block(buffer, addr, br);
+ z80_bus_cmd(Release);
}
+ addr += br;
- FRESULT fr = f_close(&File);
- if (!res)
- res = fr;
- timer = get_timer(timer);
- printf_P(PSTR("%lu (0x%lx) bytes read/written with %lu bytes/sec.\n"),
- bytes_rw, bytes_rw, timer ? (bytes_rw * 1000 / timer) : 0);
+ bytes_rw += br;
+ if (cnt != br) {
+ if (dowrite)
+ printf_P(PSTR("Disk full?\n"));
+ break;
+ }
+ if (check_abort())
+ break;
}
+
+ FRESULT fr = f_close(&File);
+ if (!res)
+ res = fr;
+ timer = get_timer(timer);
+ printf_P(PSTR("%lu (%#lx) bytes read/written with %lu bytes/sec.\n"),
+ bytes_rw, bytes_rw, timer ? (bytes_rw * 1000 / timer) : 0);
}
}
free(buffer);
- if (buserr)
- my_puts_P(PSTR("Bus timeout\n"));
if (res)
- put_rc(res);
- if (buserr || res)
- return CMD_RET_FAILURE;
+ cmd_error(CMD_RET_FAILURE, res, PSTR("'%s'"), argv[1]);
+ if (buserr)
+ cmd_error(CMD_RET_FAILURE, EBUSTO, NULL);
return CMD_RET_SUCCESS;
}
projects / z180-stamp.git / blobdiff