X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/2f53dd651e4bc075376ade16897272b41fd08a14..b6cf9ca456a60870373c9afc848b9bb9b22c431c:/avr/cmd_fat.c diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index 9222c1b..c97fd79 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -1,387 +1,914 @@ +/* + * (C) Copyright 2014,2016,2018 Leo C. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +/* + * FAT filesystem commands + */ + #include "common.h" -#include -#include -#include +#include "cmd_fat.h" +#include +uint32_t fat_time(const struct tm * timeptr); -#include "command.h" #include "ff.h" #include "z80-if.h" +#include "eval_arg.h" +#include "con-utils.h" #include "print-utils.h" #include "timer.h" +#include "debug.h" +#include "env.h" +#include "getopt-min.h" +#define DEBUG_FA 0 /* set to 1 to debug */ +#define DEBUG_LS 0 /* set to 1 to debug */ +#define DEBUG_RM 0 /* set to 1 to debug */ +#define DEBUG_CP 0 /* set to 1 to debug */ -DWORD get_fattime (void) +#define debug_fa(fmt, args...) \ + debug_cond(DEBUG_FA, fmt, ##args) +#define debug_ls(fmt, args...) \ + debug_cond(DEBUG_LS, fmt, ##args) +#define debug_rm(fmt, args...) \ + debug_cond(DEBUG_RM, fmt, ##args) +#define debug_cp(fmt, args...) \ + debug_cond(DEBUG_CP, fmt, ##args) + + +/* TODO: use memory size test function (z80_memsize_detect() ) */ +#define MAX_MEMORY CONFIG_SYS_RAMSIZE_MAX +#define BUFFER_SIZE FF_MAX_SS +#define CPY_BUF_SIZE (2*FF_MAX_SS) +#define PATH_MAX CONFIG_SYS_MAX_PATHLEN + + +/* + * Multible (fat) partitions per physical drive are not supported, + * but we have up to 2 sdcard slots. + */ +static FATFS FatFs0; +static FATFS FatFs1; + +void setup_fatfs(void) { - return 0; + f_mount(&FatFs0, "0:", 0); + f_mount(&FatFs1, "1:", 0); } +DWORD get_fattime (void) +{ + time_t timer; + struct tm tm_timer; + + time(&timer); + gmtime_r(&timer, &tm_timer); + + return fat_time(&tm_timer); +} -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") - }; static -void put_rc (FRESULT rc) +bool check_abort(void) { -#if GCC_BUG_61443 - printf_P(PSTR("rc=%u FR_"), rc); - my_puts_P(rc_names[rc]); - my_puts_P(PSTR("\n")); -#else - printf_P(PSTR("rc=%u FR_%S\n"), rc, rc_names[rc]); -#endif + bool ret = ctrlc(); + + if (ret) + printf_P(PSTR("Abort\n")); + + return ret; } -/* Work register for fs command */ -static DWORD AccSize; -static WORD AccFiles, AccDirs; -FILINFO Finfo; + +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") + }; + + +const FLASH char * fat_rctostr(FRESULT rc) +{ + return rc < ARRAY_SIZE(rc_strings) ? rc_strings[rc] : PSTR(" Unknown Error"); +} static -FRESULT scan_files ( - char* path /* Pointer to the working buffer with start path */ -) +void swirl(void) +{ + static const FLASH char swirlchar[] = { '-','\\','|','/' }; + static uint_fast8_t cnt; + static uint32_t tstamp; + + if (get_timer(0) > tstamp) { + tstamp = get_timer(0) + 250; + putchar('\b'); + cnt = (cnt+1) & 3; + putchar(swirlchar[cnt]); + } +} + +/* + * pwd - Print current directory of the current drive. + * + */ +command_ret_t do_pwd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) { - DIR dirs; FRESULT res; - int i; - char *fn; + TCHAR buf[PATH_MAX]; - res = f_opendir(&dirs, path); - if (res == FR_OK) { - i = strlen(path); - while (((res = f_readdir(&dirs, &Finfo)) == FR_OK) && Finfo.fname[0]) { - if (_FS_RPATH && Finfo.fname[0] == '.') continue; -#if _USE_LFN - fn = *Finfo.lfname ? Finfo.lfname : Finfo.fname; -#else - fn = Finfo.fname; -#endif - if (Finfo.fattrib & AM_DIR) { - AccDirs++; - path[i] = '/'; strcpy(path+i+1, fn); - res = scan_files(path); - path[i] = '\0'; - if (res != FR_OK) break; - } else { -// printf_P(PSTR("%s/%s\n"), path, fn); - AccFiles++; - AccSize += Finfo.fsize; - } - } - } + res = f_getcwd(buf, PATH_MAX); /* Get current directory path */ - return res; + if (res != FR_OK) + cmd_error(CMD_RET_FAILURE, res, NULL); + + puts(buf); + + return CMD_RET_SUCCESS; } /* - * fatstat path - Show logical drive status + * cd - Change the current/working directory. * */ -command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) { - FATFS FatFs, *fs; - DWORD p1, p2; - FRESULT res; - char buffer[512]; + TCHAR *path; + FRESULT res = FR_OK; - (void) cmdtp; (void) flag; (void) argc; + if (argc < 2) { + path = getenv_str(PSTR(ENV_HOME)); + if (path == NULL) { + cmd_error(CMD_RET_FAILURE, 0, PSTR("\"%S\" not set"), PSTR(ENV_HOME)); + } + } else + path = argv[1]; - res = f_mount(&FatFs, argv[1], 0); - if (!res) - res = f_getfree(argv[1], &p2, &fs); - if (res) { - put_rc(res); - return CMD_RET_FAILURE; - } + if (strlen(path) > 1 && path[1] == ':') + res = f_chdrive(path); - printf_P(PSTR( - "FAT type: %u\n" - "Bytes/Cluster: %lu\n" - "Number of FATs: %u\n" - "Root DIR entries: %u\n" - "Sectors/FAT: %lu\n" - "Number of clusters: %lu\n" - "FAT start (lba): %lu\n" - "DIR start (lba,cluster): %lu\n" - "Data start (lba): %lu\n"), - fs->fs_type, (DWORD)fs->csize * 512, fs->n_fats, - fs->n_rootdir, fs->fsize, fs->n_fatent - 2, - fs->fatbase, fs->dirbase, fs->database); - -#if _USE_LABEL - TCHAR label[12]; - res = f_getlabel(argv[1], label, &p1); - if (res) { - put_rc(res); - return CMD_RET_FAILURE; - } - printf_P(PSTR( - "Volume name: %s\n" - "Volume S/N: %04X-%04X\n"), - label, (WORD)((DWORD)p1 >> 16), (WORD)(p1 & 0xFFFF)); -#endif - my_puts_P(PSTR("\n...")); - AccSize = AccFiles = AccDirs = 0; + if (res == FR_OK) + res = f_chdir(path); - strcpy(buffer, argv[1]); + if (res != FR_OK) + cmd_error(CMD_RET_FAILURE, res, NULL); - res = scan_files(buffer); - if (res) { - put_rc(res); - return CMD_RET_FAILURE; - } - printf_P(PSTR("\r%u files, %lu bytes.\n%u folders.\n" - "%lu KB total disk space.\n%lu KB available.\n"), - AccFiles, AccSize, AccDirs, - (fs->n_fatent - 2) * (fs->csize / 2), p2 * (fs->csize / 2) - ); - - res = f_mount(NULL, argv[1], 0); - if (res) { - put_rc(res); - return CMD_RET_FAILURE; - } return CMD_RET_SUCCESS; } +static +void print_dirent(FILINFO *f) +{ + printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %s\n"), + (f->fattrib & AM_DIR) ? 'D' : '-', + (f->fattrib & AM_RDO) ? 'R' : '-', + (f->fattrib & AM_HID) ? 'H' : '-', + (f->fattrib & AM_SYS) ? 'S' : '-', + (f->fattrib & AM_ARC) ? 'A' : '-', + (f->fdate >> 9) + 1980, (f->fdate >> 5) & 15, f->fdate & 31, + (f->ftime >> 11), (f->ftime >> 5) & 63, + f->fsize, f->fname); +} + +char *path_split(char *p) +{ + if (isdigit(p[0]) && (p[1] == ':')) + p += 2; + + char *ps = strrchr(p, '/'); + if (ps) { + if (ps == p) { + ++ps; + memmove(ps+1, ps, strlen(ps)+1); + } + *ps++ = '\0'; + } + + return ps; +} + +command_ret_t do_mkdir(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) +{ + int ret = CMD_RET_SUCCESS; + FRESULT res; + + if (argc < 1) + return CMD_RET_USAGE; + + for (uint8_t i = 1; i < argc; i++) { + if ((res = f_mkdir(argv[i])) != FR_OK) { + ret = CMD_RET_FAILURE; + cmd_error(0, res, PSTR("cannot create directory '%s'"), argv[i]); + } + } + return ret; +} + /* - * fatls path - Directory listing + * ls path - Directory listing * */ -command_ret_t do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_ls(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) { - FATFS FatFs, *fs; - DIR Dir; /* Directory object */ - FILINFO Finfo; + FATFS *fs; + DIR dir; /* Directory object */ + FILINFO finfo; unsigned long p1; unsigned int s1, s2; - FRESULT res; -#if _USE_LFN - char Lfname[_MAX_LFN+1]; - Finfo.lfname = Lfname; - Finfo.lfsize = sizeof Lfname; -#endif + FRESULT res = FR_OK; + char buf[PATH_MAX]; + char *path = buf; + char *pattern; - (void) cmdtp; (void) flag; (void) argc; - res = f_mount(&FatFs, argv[1], 0); - if (!res) - res = f_opendir(&Dir, argv[1]); - if (res) { - put_rc(res); - return CMD_RET_FAILURE; + memset(buf, 0, PATH_MAX); + if (argc < 2) { + buf[0] = '.'; + } else { + strncpy(path, argv[1], PATH_MAX-1); } + pattern = path_split(path); + debug_ls("### path, pattern: '%s', '%s'\n", path[0] ? path : "", pattern ? pattern : ""); + + if (pattern == NULL) { + res = f_opendir(&dir, path); + if (res == FR_NO_PATH || res == FR_INVALID_NAME) { + pattern = path; + path = "."; + } else if (res != FR_OK) { + cmd_error(CMD_RET_FAILURE, res, PSTR("'%s'"), path); + } + } + debug_ls("### path, pattern: '%s', '%s'\n", path, pattern ? pattern : ""); + + if (pattern == NULL || *pattern == '\0') + pattern = "*"; + + debug_ls("### path, pattern: '%s', '%s'\n", path, pattern ? pattern : ""); + + res = f_findfirst(&dir, &finfo, path, pattern); p1 = s1 = s2 = 0; for(;;) { - res = f_readdir(&Dir, &Finfo); - if ((res != FR_OK) || !Finfo.fname[0]) + if (res != FR_OK) + cmd_error(CMD_RET_FAILURE, res, NULL); + if (!finfo.fname[0]) break; - if (Finfo.fattrib & AM_DIR) { + if (finfo.fattrib & AM_DIR) { s2++; } else { - s1++; p1 += Finfo.fsize; + s1++; p1 += finfo.fsize; } - printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %s"), - (Finfo.fattrib & AM_DIR) ? 'D' : '-', - (Finfo.fattrib & AM_RDO) ? 'R' : '-', - (Finfo.fattrib & AM_HID) ? 'H' : '-', - (Finfo.fattrib & AM_SYS) ? 'S' : '-', - (Finfo.fattrib & AM_ARC) ? 'A' : '-', - (Finfo.fdate >> 9) + 1980, (Finfo.fdate >> 5) & 15, Finfo.fdate & 31, - (Finfo.ftime >> 11), (Finfo.ftime >> 5) & 63, - Finfo.fsize, &(Finfo.fname[0])); -#if _USE_LFN - for (int i = strlen(Finfo.fname); i < 14; i++) - putchar(' '); - printf_P(PSTR("%s\n"), Lfname); -#else - putchar('\n'); -#endif + print_dirent(&finfo); + if (check_abort()) + break; + res = f_findnext(&dir, &finfo); } if (res == FR_OK) { printf_P(PSTR("%4u File(s),%10lu bytes total\n%4u Dir(s)"), s1, p1, s2); - if (f_getfree(argv[1], (DWORD*)&p1, &fs) == FR_OK) + if (f_getfree(path, (DWORD*)&p1, &fs) == FR_OK) printf_P(PSTR(", %10luK bytes free\n"), p1 * fs->csize / 2); } - if (res) { - put_rc(res); - return CMD_RET_FAILURE; - } + if (res) + cmd_error(CMD_RET_FAILURE, res, NULL); return CMD_RET_SUCCESS; } +typedef void (*fatfunc_t)(const TCHAR* path_old, const TCHAR* path_new); + +command_ret_t exit_val; +uint8_t cmd_flags; +#define I_FLAG (1<<1) // prompt before overwrite (overrides a previous -n option) +#define N_FLAG (1<<2) // do not overwrite an existing file (overrides a previous -i option) +#define F_FLAG (1<<3) // overwrite existing file ignoring write protection +#define P_FLAG (1<<4) // preserve attributes and timestamps +#define V_FLAG (1<<5) // explain what is being done + +char* splitpath(const char* path) +{ + char* fs = strrchr(path, '/'); + char* bs = strrchr(path, '\\'); + if (fs > bs) { + *fs = '\0'; + return fs + 1; + } else if (bs != NULL) { + *bs = '\0'; + return bs + 1; + } + return NULL; +} + /* - * fatread - load binary file from a dos filesystem - * [bytes [pos]] - */ -command_ret_t do_fat_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + * Copy File +*/ +FRESULT copy_file(const TCHAR* src, const TCHAR* dst) { - FATFS FatFs; - FIL File; - unsigned long bytes = 0x80000; - unsigned long pos= 0; - unsigned long bytes_read; - uint32_t addr; - FRESULT res; - bool buserr = 0; - uint32_t timer; - uint8_t buffer[512]; + FIL fsrc, fdst; + FRESULT res; + + /* File copy buffer */ + uint8_t *buffer = (uint8_t *) malloc(CPY_BUF_SIZE); + if (buffer == NULL) { + res = (FRESULT) ENOMEM; + } else { + + /* Open source file */ + res = f_open(&fsrc, src, FA_READ); + if (res == FR_OK) { + + /* Create destination file */ + res = f_open(&fdst, dst, FA_WRITE | FA_CREATE_NEW); + if (res == FR_OK) { + UINT br, bw; /* File read/write count */ + + /* Copy source to destination */ + for (;;) { + res = f_read(&fsrc, buffer, CPY_BUF_SIZE, &br); /* Read a chunk of source file */ + if (res || br == 0) + break; /* error or eof */ + res = f_write(&fdst, buffer, br, &bw); /* Write it to the destination file */ + if (res != FR_OK) + break; + if (bw < br) { + res = (FRESULT) EFULL; /* disk full */ + break; + } + } + +debug_cp("==== copy() res: %d, br: %d, bw: %d\n", res, br, bw); + f_close(&fdst); + if (res != FR_OK) + f_unlink(dst); + } + f_close(&fsrc); + } + free(buffer); + } + + return res; +} + +void ff_remove(const TCHAR *file, const TCHAR *dest UNUSED) +{ + FRESULT res = FR_OK; + + debug_rm("==== ff_remove: '%s'\n", file); + + if (!(cmd_flags & N_FLAG)) { + if ((res = f_unlink(file)) == FR_OK) { + if (cmd_flags & V_FLAG) + printf_P(PSTR("removed: '%s'\n"), file); + } else { + cmd_error(0, res, PSTR("cannot remove '%s'"), file); + } + } else { + printf_P(PSTR("not removed: '%s'\n"), file); + } + + exit_val = (res != FR_OK); + return; +} + +void ff_copy(const TCHAR* path_old, const TCHAR* path_new) +{ + FRESULT res; + + debug_cp("==== ff_copy: '%s' --> '%s'\n", path_old, path_new); + + if (cmd_flags & V_FLAG) + printf_P(PSTR("'%s' -> '%s'\n"), path_old, path_new); + if ((res = copy_file(path_old, path_new)) != FR_OK) + cmd_error(0, res, PSTR("error copying '%s' to '%s'"), path_old, path_new); + + exit_val = (res != FR_OK); + return; +} + +void ff_iterate(fatfunc_t fatfunc, int count, char* const file[], char* dest) +{ + FRESULT res = 0; + DIR dir; + FILINFO finfo; + char srcpath[PATH_MAX], destpath[PATH_MAX]; + + uint8_t dest_is_dir = dest != NULL && f_stat(dest, &finfo) == FR_OK && finfo.fattrib & AM_DIR; + for (uint8_t i = 0; i < count; i++) { + char* pattern = NULL; + strcpy(srcpath, file[i]); + char* p1 = path_split(srcpath); + + if (p1 != NULL) { + pattern = (char *) malloc(strlen(p1)+1); + strcpy(pattern, p1); + } + if (pattern != NULL) { + res = f_findfirst(&dir, &finfo, srcpath, pattern); + p1 = srcpath+strlen(srcpath)-1; + if (*p1++ != '/') + *(p1++) = '/'; + } else { + res = f_findfirst(&dir, &finfo, ".", file[i]); + p1 = srcpath; + } + if ((res != FR_OK) || (finfo.fname[0] == 0)) { + cmd_error(0, res, PSTR("'%s': no such file or directory"), file[i]); + exit_val = CMD_RET_FAILURE; + } else { + + while (res == FR_OK && finfo.fname[0] != 0) { + strcpy(p1, finfo.fname); + if (dest != NULL) { + strcpy(destpath, dest); + if (dest_is_dir) { + strcat_P(destpath, PSTR("/")); + strcat(destpath, finfo.fname); + } + } + fatfunc(srcpath, destpath); + res = f_findnext(&dir, &finfo); + } + if (res != FR_OK) + cmd_error(CMD_RET_FAILURE, res, PSTR("error enumerating files")); + } + f_closedir(&dir); + free(pattern); + } +} + +command_ret_t do_rm(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) +{ + exit_val = CMD_RET_SUCCESS; + cmd_flags = 0; + + int opt; + while ((opt = getopt(argc, argv, PSTR("nv"))) != -1) { + switch (opt) { + case 'n': + cmd_flags |= N_FLAG; + break; + case 'v': + cmd_flags |= V_FLAG; + break; + default: + return CMD_RET_USAGE; + break; + } + } + argc -= optind; + argv += optind; - (void) cmdtp; (void) flag; + debug_rm("==== do_rm: argc, argv[0]: %d, '%s'\n", argc, argv[0]); - if (argc < 3) + if (argc < 1) return CMD_RET_USAGE; - addr = strtoul(argv[2], 0, 16); - if (argc > 3) - bytes = strtoul(argv[3], 0, 16); - if (argc > 4) - pos = strtoul(argv[4], 0, 16); + ff_iterate(ff_remove, argc, argv, NULL); + + return exit_val; +} + +command_ret_t do_cp(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) +{ + exit_val = CMD_RET_SUCCESS; + cmd_flags = 0; + + int opt; + while ((opt = getopt(argc, argv, PSTR("v"))) != -1) { + switch (opt) { + case 'v': + cmd_flags |= V_FLAG; + break; + default: + return CMD_RET_USAGE; + break; + } + } + argc -= optind; + argv += optind; + + debug_cp("==== do_rm: argc, argv[0]: %d, '%s'\n", argc, argv[0]); + + if (argc < 2) + return CMD_RET_USAGE; + + ff_iterate(ff_copy, argc - 1, argv, argv[argc - 1]); + + return exit_val; +} + +/* + * tst path - for debugging: test access with different functions + * + */ +command_ret_t do_tst(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) +{ + DIR Dir; /* Directory object */ + FILINFO finfo; + FRESULT res = FR_OK; + char *path = ""; + char *pattern = "*"; + + printf_P(PSTR("sizeof DIR: %u, sizeof FIL: %u\n"), sizeof (DIR), sizeof (FILINFO)); + + char * buf = (char *) malloc(BUFFER_SIZE); + if (buf == NULL) { + cmd_error(CMD_RET_FAILURE, ENOMEM, NULL); + } + res = f_getcwd(buf, BUFFER_SIZE); /* Get current directory path */ - res = f_mount(&FatFs, argv[1], 0); if (!res) { - res = f_open(&File, argv[1], FA_READ); + printf_P(PSTR("cwd: '%s'\n"), buf); + } + free(buf); + if (res) + cmd_error(CMD_RET_FAILURE, res, NULL); - if (!res) { - res = f_lseek(&File, pos); - if (!res) { - bytes_read = 0; - timer = get_timer(0); - while (bytes) { - unsigned int cnt, br; - - if (bytes >= sizeof buffer) { - cnt = sizeof buffer; - bytes -= sizeof buffer; - } else { - cnt = bytes; bytes = 0; - } - 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; + if (argc > 1) + path = argv[1]; + if (argc > 2) + pattern = argv[2]; - bytes_read += br; - if (cnt != br) - break; - } - timer = get_timer(timer); - printf_P(PSTR("%lu bytes read with %lu bytes/sec.\n"), - bytes_read, timer ? (bytes_read * 1000 / timer) : 0); + printf_P(PSTR("arg: '%s' '%s'\n"), path, pattern); + printf_P(PSTR("==== f_stat: ")); + res = f_stat(path, &finfo); + cmd_error(0, res, NULL); + if (res == FR_OK) { + print_dirent(&finfo); + } + + printf_P(PSTR("==== f_findfirst: ")); + res = f_findfirst(&Dir, &finfo, path, pattern); /* Start to search for files */ + cmd_error(CMD_RET_FAILURE, res, NULL); + if (res == FR_OK) { + print_dirent(&finfo); + } + f_closedir(&Dir); + + printf_P(PSTR("==== f_opendir: ")); + res = f_opendir(&Dir, path); + cmd_error(CMD_RET_FAILURE, res, NULL); + f_closedir(&Dir); + + return CMD_RET_SUCCESS; +} + +/* Work register for fs command */ +struct stat_dat_s { + DWORD AccSize; + WORD AccFiles, AccDirs; + FILINFO finfo; +}; + +static +FRESULT scan_files ( + char *path, /* Pointer to the working buffer with start path */ + struct stat_dat_s *statp +) +{ + DIR dirs; + FRESULT res; + int i; + char *fn; + + res = f_opendir(&dirs, path); + swirl(); + if (res == FR_OK) { + i = strlen(path); + while (((res = f_readdir(&dirs, &statp->finfo)) == FR_OK) && + statp->finfo.fname[0]) { + if (FF_FS_RPATH && statp->finfo.fname[0] == '.') + continue; + fn = statp->finfo.fname; + if (statp->finfo.fattrib & AM_DIR) { + statp->AccDirs++; + path[i] = '/'; + strcpy(path+i+1, fn); + res = scan_files(path, statp); + path[i] = '\0'; + if (res != FR_OK) + break; + } else { + //printf_P(PSTR("%s/%s\n"), path, fn); + statp->AccFiles++; + statp->AccSize += statp->finfo.fsize; + } + if (check_abort()) { + res = 255; + break; } } - f_mount(NULL, argv[1], 0); } - if (buserr) - my_puts_P(PSTR("Bus timeout\n")); + return res; +} + + +/* + * fatstat path - Show logical drive status + * + */ +command_ret_t do_stat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) +{ + FATFS *fs; + DWORD nfreeclst; + FRESULT res; + char *buf; + char *path = ""; + struct stat_dat_s statp; + + buf = (char *) malloc(PATH_MAX); + if (buf == NULL) + cmd_error(CMD_RET_FAILURE, ENOMEM, NULL); + + if (argc > 1) + path = argv[1]; + res = f_getfree(path, &nfreeclst, &fs); + if (!res) { + printf_P(PSTR( + "FAT type: %u\n" + "Bytes/Cluster: %lu\n" + "Number of FATs: %u\n" + "Root DIR entries: %u\n" + "Sectors/FAT: %lu\n" + "Number of clusters: %lu\n" + "FAT start (lba): %lu\n" + "DIR start (lba,cluster): %lu\n" + "Data start (lba): %lu\n"), + fs->fs_type, (DWORD)fs->csize * 512, fs->n_fats, + fs->n_rootdir, fs->fsize, fs->n_fatent - 2, + fs->fatbase, fs->dirbase, fs->database); + +#if FF_USE_LABEL + DWORD serial; + res = f_getlabel(path, buf, &serial); + if (!res) { + printf_P(PSTR( + "Volume name: %s\n" + "Volume S/N: %04X-%04X\n"), + buf, (WORD)(serial >> 16), (WORD)(serial & 0xFFFF)); + } +#endif + if (!res) { + statp.AccSize = statp.AccFiles = statp.AccDirs = 0; + strcpy(buf, path); + + my_puts_P(PSTR("\nCounting... ")); + res = scan_files(buf, &statp); + putchar('\r'); + } + if (!res) { + printf_P(PSTR("%u files, %lu bytes.\n%u folders.\n" + "%lu KB total disk space.\n%lu KB available.\n"), + statp.AccFiles, statp.AccSize, statp.AccDirs, + (fs->n_fatent - 2) * (fs->csize / 2), nfreeclst * (fs->csize / 2) + ); + } + } + + free(buf); if (res) - put_rc(res); - if (buserr || res) - return CMD_RET_FAILURE; + cmd_error(CMD_RET_FAILURE, res, NULL); return CMD_RET_SUCCESS; } /* - * fatwrite - write file into a dos filesystem - * + * fatread/write - load binary file to/from a dos filesystem + * read [bytes [pos]] + * write */ -command_ret_t do_fat_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_rw(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) { - FATFS FatFs; FIL File; - unsigned long bytes; - unsigned long bytes_written; uint32_t addr; - FRESULT res; + unsigned long bytes; + unsigned long pos; + unsigned long bytes_rw; + + bool dowrite = (argv[0][0] == 'w'); + FRESULT res = FR_OK; bool buserr = 0; uint32_t timer; - uint8_t buffer[512]; + uint8_t *buffer; - (void) cmdtp; (void) flag; - - if (argc < 4) + if (argc < (dowrite ? 4 : 3)) return CMD_RET_USAGE; - addr = strtoul(argv[2], 0, 16); - bytes = strtoul(argv[3], 0, 16); + addr = eval_arg(argv[2], NULL); + 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; + if (argc > 4) + pos = eval_arg(argv[4], NULL); + else + pos = 0; + + if (addr + bytes > MAX_MEMORY) + bytes = MAX_MEMORY - addr; + + buffer = (uint8_t *) malloc(BUFFER_SIZE); + if (buffer == NULL) + cmd_error(CMD_RET_FAILURE, ENOMEM, NULL); + + res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS + : FA_READ ); - res = f_mount(&FatFs, argv[1], 0); if (!res) { - res = f_open(&File, argv[1], FA_CREATE_ALWAYS | FA_WRITE); + res = f_lseek(&File, pos); if (!res) { - bytes_written = 0; + bytes_rw = 0; timer = get_timer(0); while (bytes) { unsigned int cnt, br; - if (bytes >= sizeof buffer) { - cnt = sizeof buffer; - bytes -= sizeof buffer; + if (bytes >= BUFFER_SIZE) { + cnt = BUFFER_SIZE; + bytes -= BUFFER_SIZE; } else { cnt = bytes; bytes = 0; } - if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) { - buserr = 1; - break; + 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); } - z80_read_block(buffer, addr, cnt); - z80_bus_cmd(Release); - res = f_write(&File, buffer, cnt, &br); - if (res != FR_OK) - break; addr += br; - bytes_written += br; - if (cnt != br) + + bytes_rw += br; + if (cnt != br) { + if (dowrite) + printf_P(PSTR("Disk full?\n")); + break; + } + if (check_abort()) break; } - res = f_close(&File); + + FRESULT fr = f_close(&File); + if (!res) + res = fr; timer = get_timer(timer); - printf_P(PSTR("%lu bytes written with %lu bytes/sec.\n"), - bytes_written, timer ? (bytes_written * 1000 / timer) : 0); + printf_P(PSTR("%lu (%#lx) bytes read/written with %lu bytes/sec.\n"), + bytes_rw, bytes_rw, timer ? (bytes_rw * 1000 / timer) : 0); } - f_mount(NULL, argv[1], 0); } - if (buserr) - my_puts_P(PSTR("Bus timeout\n")); + free(buffer); + 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; } + +/* + * command table for fat subcommands + */ + +cmd_tbl_t cmd_tbl_fat[] = { +CMD_TBL_ITEM( + status, 2, CTBL_RPT, do_stat, + "Show logical drive status", + "dev" +), +CMD_TBL_ITEM( + pwd, 2, CTBL_RPT|CTBL_SUBCMDAUTO, do_pwd, + "Print name of current/working directory", + "" +), +CMD_TBL_ITEM( + cd, 2, 0|CTBL_SUBCMDAUTO, do_cd, + "Change the current/working directory.", + "path" +), +CMD_TBL_ITEM( + mkdir, CONFIG_SYS_MAXARGS, 0, do_mkdir, + "Create the DIRECTORY(ies), if they do not already exist.", + "DIRECTORY..." +), +CMD_TBL_ITEM( + ls, 2, CTBL_RPT|CTBL_SUBCMDAUTO, do_ls, + "Directory listing", + "path" +), +CMD_TBL_ITEM( + tst, 3, CTBL_DBG|CTBL_RPT, do_tst, + "FatFS test function", + "[path [pattern]]" +), +CMD_TBL_ITEM( + rm, CONFIG_SYS_MAXARGS, 0, do_rm, + "Remove FILE(s) or empty DIRECTORY(ies)", + "[OPTION]... [FILE]...\n" + //" -i prompt before removal\n" + " -n do not remove\n" + " -v explain what is being done" +), +CMD_TBL_ITEM( + cp, CONFIG_SYS_MAXARGS, 0, do_cp, + "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.", + "[OPTION]... SOURCE... DEST\n" +// " -f overwrite existing file ignoring write protection\n" +// " this option is ignored when the -n option is also used\n" +// " -i prompt before overwrite (overrides a previous -n option)\n" +// " -n do not overwrite an existing file (overrides a previous -i option)\n" +// " -p preserve attributes and timestamps\n" + " -v explain what is being done" +), + +CMD_TBL_ITEM( + load, 5, 0, do_rw, + "load binary file from a dos filesystem", + " [bytes [pos]]\n" + " - Load binary file 'path/filename' on logical drive 'd'\n" + " to address 'addr' from dos filesystem.\n" + " 'pos' gives the file position to start loading from.\n" + " If 'pos' is omitted, 0 is used. 'pos' requires 'bytes'.\n" + " 'bytes' gives the size to load. If 'bytes' is 0 or omitted,\n" + " the load stops on end of file." +), +CMD_TBL_ITEM( + write, 4, 0, do_rw, + "write file into a dos filesystem", + " \n" + " - Write file to 'path/filename' on logical drive 'd' from RAM\n" + " starting at address 'addr'.\n" +), + +CMD_TBL_ITEM( + help, CONFIG_SYS_MAXARGS, CTBL_RPT, do_help, + "Print sub command description/usage", + "\n" + " - print brief description of all sub commands\n" + "fat help command ...\n" + " - print detailed usage of sub cmd 'command'" +), + +/* This does not use the CMD_TBL_ITEM macro as ? can't be used in symbol names */ + {FSTR("?"), CONFIG_SYS_MAXARGS, 1, do_help, + NULL, +#ifdef CONFIG_SYS_LONGHELP + FSTR(""), +#endif /* CONFIG_SYS_LONGHELP */ + NULL, +#ifdef CONFIG_AUTO_COMPLETE + NULL, +#endif +}, +/* Mark end of table */ +CMD_TBL_END(cmd_tbl_fat) +}; + + +command_ret_t do_fat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) +{ + puts_P(PSTR("Huch?")); + + return CMD_RET_USAGE; +}