X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/7a1ed62033184b79388b541258a14bc579389bdb..7439a2b57aa403a4b4d0b5cf85095447bd9a3703:/avr/cmd_fat.c diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index b083456..2d64251 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2014,2016 Leo C. + * (C) Copyright 2014,2016,2018 Leo C. * * SPDX-License-Identifier: GPL-2.0 */ @@ -9,6 +9,7 @@ */ #include "cmd_fat.h" +#include #include "ff.h" #include "z80-if.h" @@ -20,15 +21,36 @@ #include "debug.h" #include "env.h" -/* TODO: use memory size test function (cmd_mem.c) */ -#define MAX_MEMORY (1ul << 19) -#define BUFFER_SIZE 512 +#define DEBUG_FA 0 /* set to 1 to debug */ +#define debug_fa(fmt, args...) \ + debug_cond(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 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. + */ FATFS FatFs0; FATFS FatFs1; -char chur_drv[3]; +command_ret_t command_ret; +char *cmdname; + + +void setup_fatfs(void) +{ + f_mount(&FatFs0, "0:", 0); + f_mount(&FatFs1, "1:", 0); +} DWORD get_fattime (void) { @@ -90,13 +112,18 @@ void put_rc (FRESULT rc) } -void setup_fatfs(void) +void err(const char *fmt, ...) { - f_mount(&FatFs0, "0:", 0); - f_mount(&FatFs1, "1:", 0); + va_list ap; + va_start(ap, fmt); + printf_P(PSTR("fat %s: "), cmdname); + vfprintf_P(stdout, fmt, ap); + va_end(ap); + printf_P(PSTR("\n")); + _delay_ms(20); + command_ret = CMD_RET_FAILURE; } - static void swirl(void) { static const FLASH char swirlchar[] = { '-','\\','|','/' }; @@ -104,160 +131,114 @@ static void swirl(void) static uint32_t tstamp; if (get_timer(0) > tstamp) { - printf_P(PSTR("\b%c"), swirlchar[cnt]); - cnt = (cnt+1) % ARRAY_SIZE(swirlchar); tstamp = get_timer(0) + 250; + putchar('\b'); + cnt = (cnt+1) & 3; + putchar(swirlchar[cnt]); } } -/* Work register for fs command */ -struct stat_dat_s { - DWORD AccSize; - WORD AccFiles, AccDirs; - FILINFO Finfo; -}; +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 -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; - } +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 res; + 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; +} /* - * fatstat path - Show logical drive status - * + * Move specified string into path. Convert "" to "." to handle BSD + * semantics for a null path. Strip trailing slashes. */ -command_ret_t do_stat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) +static PATH_T *path_setup(char *string) { - FATFS *fs; - DWORD nfreeclst; - FRESULT res; - char *path; - struct stat_dat_s statp; - - (void) cmdtp; (void) flag; (void) argc; - - path = (char *) malloc(BUFFER_SIZE); - if (path == NULL) { - printf_P(PSTR("fat stat: Out of Memory!\n")); - free(path); - return CMD_RET_FAILURE; + if (strlen(string) > PATH_MAX) { + err(PSTR("'%s': name too long"), string); + return NULL; } - res = f_getfree(argv[1], &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 _USE_LABEL - TCHAR label[12]; - DWORD serial; - res = f_getlabel(argv[1], label, &serial); - if (!res) { - printf_P(PSTR( - "Volume name: %s\n" - "Volume S/N: %04X-%04X\n"), - label, (WORD)(serial >> 16), (WORD)(serial & 0xFFFF)); - } -#endif - if (!res) { - my_puts_P(PSTR("\nCounting... ")); - statp.AccSize = statp.AccFiles = statp.AccDirs = 0; - strcpy(path, argv[1]); + PATH_T *p = (PATH_T *) malloc(sizeof *p); + if (p == NULL) { + err(PSTR("'%s': Out of Memory"), string); + return NULL; + } - res = scan_files(path, &statp); - } - if (!res) { - printf_P(PSTR("\r%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) - ); + 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 { + err(PSTR("'%s': Out of Memory"), string); + return NULL; } } - free(path); - if (res) { - put_rc(res); - return CMD_RET_FAILURE; + p->p_end = p->p_path + len; + if (p->p_path == p->p_end) { + *p->p_end++ = '.'; + *p->p_end = '\0'; } - return CMD_RET_SUCCESS; + + strip_trailing_slash(p); + return p; } /* * pwd - Print current directory of the current drive. * */ -command_ret_t do_pwd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) +command_ret_t do_pwd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) { FRESULT res; char *buf; - (void) cmdtp; (void) flag; (void) argc; (void) argv; - - buf = (char *) malloc(BUFFER_SIZE); + buf = (char *) malloc(PATH_MAX); if (buf == NULL) { printf_P(PSTR("pwd: Out of Memory!\n")); - free(buf); return CMD_RET_FAILURE; } + *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) { + if (res == FR_OK) { puts(buf); } free(buf); - if (res) { + if (res != FR_OK) { put_rc(res); return CMD_RET_FAILURE; } @@ -269,12 +250,12 @@ command_ret_t do_pwd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const * cd - Change the current/working directory. * */ -command_ret_t do_cd(cmd_tbl_t *cmdtp, uint_fast8_t 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[]) { char *arg; - FRESULT res = 0; + FRESULT res = FR_OK; - (void) cmdtp; (void) flag; (void) argc; + cmdname = argv[0]; if (argc < 2) { arg = getenv_str(PSTR(ENV_HOME)); @@ -285,18 +266,20 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const } else arg = argv[1]; - if (arg[1] == ':') { - char drv[3]; - drv[2] = '\0'; - drv[1] = ':'; - drv[0] = arg[0]; - res = f_chdrive(drv); + 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) { - res = f_chdir(arg); + if (res == FR_OK) { + res = f_chdir(path->p_path); + debug_fa("### f_chdir(): p_path: '%s', res: %d\n", path->p_path, res); } - - if (res) { + free(path); + if (res != FR_OK) { put_rc(res); return CMD_RET_FAILURE; } @@ -305,10 +288,10 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const /* - * fatls path - Directory listing + * ls path - Directory listing * */ -command_ret_t do_ls(cmd_tbl_t *cmdtp, uint_fast8_t 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 *fs; DIR Dir; /* Directory object */ @@ -318,19 +301,17 @@ command_ret_t do_ls(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const FRESULT res = FR_OK; char *buf; - (void) cmdtp; (void) flag; (void) argc; - buf = (char *) malloc(BUFFER_SIZE); + buf = (char *) malloc(PATH_MAX); if (buf == NULL) { printf_P(PSTR("pwd: Out of Memory!\n")); - free(buf); return CMD_RET_FAILURE; } 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); @@ -378,12 +359,12 @@ command_ret_t do_ls(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const return CMD_RET_SUCCESS; } +#if 0 static FRESULT mkpath(TCHAR *path) { /* TODO: */ (void) path; -#if 0 FILINFO fd TCHAR *p, *q; FRESULT ret; @@ -402,17 +383,140 @@ FRESULT mkpath(TCHAR *path) return ret; p = q + 1; } -#endif return FR_OK; } +#endif + +/* 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; + } + } + } + + 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) { + printf_P(PSTR("fat stat: Out of Memory!\n")); + return CMD_RET_FAILURE; + } + + 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); + return CMD_RET_FAILURE; + } + return CMD_RET_SUCCESS; +} /* * fatread/write - load binary file to/from a dos filesystem * read [bytes [pos]] * write */ -command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t 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[]) { FIL File; uint32_t addr; @@ -426,8 +530,6 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const uint32_t timer; uint8_t *buffer; - (void) cmdtp; (void) flag; - if (argc < (dowrite ? 4 : 3)) return CMD_RET_USAGE; @@ -451,13 +553,9 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const buffer = (uint8_t *) malloc(BUFFER_SIZE); if (buffer == NULL) { printf_P(PSTR("fatstat: Out of Memory!\n")); - free(buffer); return CMD_RET_FAILURE; } - if (dowrite) { - res = mkpath(argv[1]); - } if (!res) { res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS : FA_READ ); @@ -531,25 +629,28 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const return CMD_RET_SUCCESS; } +/* + * command table for fat subcommands + */ cmd_tbl_t cmd_tbl_fat[] = { CMD_TBL_ITEM( - stat, 2, CTBL_RPT, do_stat, + status, 2, CTBL_RPT, do_stat, "Show logical drive status", "dev" ), CMD_TBL_ITEM( - pwd, 2, CTBL_RPT, do_pwd, + pwd, 2, CTBL_RPT|CTBL_SUBCMDAUTO, do_pwd, "Print name of current/working directory", "" ), CMD_TBL_ITEM( - cd, 2, 0, do_cd, + cd, 2, 0|CTBL_SUBCMDAUTO, do_cd, "Change the current/working directory.", "path" ), CMD_TBL_ITEM( - ls, 2, CTBL_RPT, do_ls, + ls, 2, CTBL_RPT|CTBL_SUBCMDAUTO, do_ls, "Directory listing", "path" ), @@ -583,7 +684,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'"), + NULL, #ifdef CONFIG_SYS_LONGHELP FSTR(""), #endif /* CONFIG_SYS_LONGHELP */ @@ -597,7 +698,7 @@ CMD_TBL_END(cmd_tbl_fat) }; -command_ret_t do_fat(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) +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?"));