X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/35edb766593d019b89a3f40b6d6cdd2b50f18032..81a43faf77dc6b8aaa9f3b9cddb89dc1e9192ebd:/avr/cmd_fat.c diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index 8ed7ae3..52ad95f 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -1,31 +1,42 @@ /* - * (C) Copyright 2014 Leo C. + * (C) Copyright 2014,2016,2018 Leo C. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0 */ /* * FAT filesystem commands */ -#include "common.h" -#include -#include -#include +#include "cmd_fat.h" -#include "command.h" #include "ff.h" #include "z80-if.h" +#include "eval_arg.h" #include "con-utils.h" #include "print-utils.h" #include "time.h" #include "timer.h" #include "debug.h" +#include "env.h" - -#define MAX_MEMORY (1ul << 20) +/* 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 +/* + * Multible (fat) partitions per physical drive are not supported, + * but we have up to 2 sdcard slots. + */ +FATFS FatFs0; +FATFS FatFs1; + +void setup_fatfs(void) +{ + f_mount(&FatFs0, "0:", 0); + f_mount(&FatFs1, "1:", 0); +} DWORD get_fattime (void) { @@ -69,21 +80,21 @@ static const FLASH char * const FLASH rc_names[] = { FSTR("TIMEOUT"), FSTR("LOCKED"), FSTR("NOT_ENOUGH_CORE"), - FSTR("TOO_MANY_OPEN_FILES") + FSTR("TOO_MANY_OPEN_FILES"), + FSTR("INVALID_PARAMETER") }; static void put_rc (FRESULT rc) { - if (rc < ARRAY_SIZE(rc_names)) { #if GCC_BUG_61443 - printf_P(PSTR("rc=%u FR_"), rc); - my_puts_P(rc_names[rc]); - my_puts_P(PSTR("\n")); + 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_names[rc]); + printf_P(PSTR("rc=%u FR_%S\n"), rc, + rc < ARRAY_SIZE(rc_names) ? rc_names[rc] : PSTR(" Unknown Error")); #endif - } } @@ -94,135 +105,72 @@ 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; -}; - -static -FRESULT scan_files ( - char *path, /* Pointer to the working buffer with start path */ - struct stat_dat_s *statp -) +/* + * 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; + char *buf; - 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 (_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; - } - } + buf = (char *) malloc(BUFFER_SIZE); + if (buf == NULL) { + printf_P(PSTR("pwd: Out of Memory!\n")); + free(buf); + return CMD_RET_FAILURE; } - return res; + res = f_getcwd(buf, BUFFER_SIZE); /* Get current directory path */ + + if (!res) { + puts(buf); + } + free(buf); + if (res) { + put_rc(res); + return CMD_RET_FAILURE; + } + 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 nfreeclst; - FRESULT res; - char *path; - struct stat_dat_s statp; - - (void) cmdtp; (void) flag; (void) argc; - - FatFs = (FATFS *) malloc(sizeof (FATFS)); - path = (char *) malloc(BUFFER_SIZE); - if (FatFs == NULL || path == NULL) { - printf_P(PSTR("fatstat: Out of Memory!\n")); - free(path); - free(FatFs); - return CMD_RET_FAILURE; + char *arg; + FRESULT res = 0; + + 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; + } + } else + arg = argv[1]; + + if (arg[1] == ':') { + char drv[3]; + drv[2] = '\0'; + drv[1] = ':'; + drv[0] = arg[0]; + res = f_chdrive(drv); } - - res = f_mount(FatFs, argv[1], 0); if (!res) { - 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]); - - 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) - ); - } - } + res = f_chdir(arg); } - free(path); - free(FatFs); - f_mount(NULL, argv[1], 0); if (res) { put_rc(res); return CMD_RET_FAILURE; @@ -232,29 +180,36 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg /* - * 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; + 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; - (void) cmdtp; (void) flag; (void) argc; - res = f_mount(&FatFs, argv[1], 0); - if (!res) - res = f_opendir(&Dir, argv[1]); - if (res) { + buf = (char *) malloc(BUFFER_SIZE); + 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 */ + else + strncpy(buf, argv[1], BUFFER_SIZE); + + if (res == FR_OK) + res = f_opendir(&Dir, buf); + if (res != FR_OK) { + free(buf); put_rc(res); return CMD_RET_FAILURE; } @@ -269,29 +224,26 @@ command_ret_t do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ } else { s1++; p1 += Finfo.fsize; } - printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu "), + printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %s\n"), (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); -#if _USE_LFN - printf_P(PSTR("%s\n"), *Lfname ? Lfname : Finfo.fname); -#else - printf_P(PSTR("%s\n"), Finfo.fname); -#endif + (Finfo.ftime >> 11), (Finfo.ftime >> 5) & 63, + Finfo.fsize, Finfo.fname); if (check_abort()) break; } 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(buf, (DWORD*)&p1, &fs) == FR_OK) printf_P(PSTR(", %10luK bytes free\n"), p1 * fs->csize / 2); } + free(buf); if (res) { put_rc(res); return CMD_RET_FAILURE; @@ -300,21 +252,16 @@ command_ret_t do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ return CMD_RET_SUCCESS; } +#if 0 static FRESULT mkpath(TCHAR *path) { /* TODO: */ (void) path; -#if 0 FILINFO fd TCHAR *p, *q; FRESULT ret; -#if _USE_LFN - fd.lfname = 0; -#endif - - res = f_stat (path, &fd) p = strchr(path, ':'); @@ -329,69 +276,180 @@ 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(BUFFER_SIZE); + 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_fat_rw(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; uint32_t addr; unsigned long bytes; unsigned long pos; unsigned long bytes_rw; - bool dowrite = (argv[0][3] == 'w'); - FRESULT res; + bool dowrite = (argv[0][0] == 'w'); + FRESULT res = FR_OK; bool buserr = 0; uint32_t timer; uint8_t *buffer; - (void) cmdtp; (void) flag; - if (argc < (dowrite ? 4 : 3)) return CMD_RET_USAGE; - addr = strtoul(argv[2], 0, 16); + 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 (argc > 3) - bytes = strtoul(argv[3], 0, 16); + bytes = eval_arg(argv[3], NULL); else bytes = MAX_MEMORY; if (argc > 4) - pos = strtoul(argv[4], 0, 16); + pos = eval_arg(argv[4], NULL); else pos = 0; if (addr + bytes > MAX_MEMORY) bytes = MAX_MEMORY - addr; - FatFs = (FATFS *) malloc(sizeof (FATFS)); buffer = (uint8_t *) malloc(BUFFER_SIZE); - if (FatFs == NULL || buffer == NULL) { + if (buffer == NULL) { printf_P(PSTR("fatstat: Out of Memory!\n")); - free(FatFs); free(buffer); return CMD_RET_FAILURE; } - res = f_mount(FatFs, argv[1], 0); - - if (!res) { - if (dowrite) { - res = mkpath(argv[1]); - } - } if (!res) { res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS : FA_READ ); @@ -451,11 +509,9 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ bytes_rw, bytes_rw, timer ? (bytes_rw * 1000 / timer) : 0); } } - f_mount(NULL, argv[1], 0); } free(buffer); - free(FatFs); if (buserr) my_puts_P(PSTR("Bus timeout\n")); @@ -466,3 +522,79 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ return CMD_RET_SUCCESS; } + +/* + * command table for fat subcommands + */ + +cmd_tbl_t cmd_tbl_fat[] = { +CMD_TBL_ITEM( + stat, 2, CTBL_RPT, do_stat, + "Show logical drive status", + "dev" +), +CMD_TBL_ITEM( + pwd, 2, CTBL_RPT, do_pwd, + "Print name of current/working directory", + "" +), +CMD_TBL_ITEM( + cd, 2, 0, do_cd, + "Change the current/working directory.", + "path" +), +CMD_TBL_ITEM( + ls, 2, CTBL_RPT, do_ls, + "Directory listing", + "path" +), +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, + FSTR("Alias for 'help'"), +#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; +}