X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/b15d22a4e43f86058b3b053096ab885a4cef6603..6c85181339758553ef199ef0fda4ffe8e3efdcd6:/avr/cmd_fat.c diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index 16a5157..db89ffa 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -1,22 +1,40 @@ +/* + * (C) Copyright 2014,2016 Leo C. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +/* + * FAT filesystem commands + */ + +#include "cmd_fat.h" #include "common.h" -#include #include #include #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" +#include "getopt-min.h" - -#define MAX_MEMORY (1ul << 20) +/* TODO: use memory size test function (cmd_mem.c) */ +#define MAX_MEMORY (1ul << 19) #define BUFFER_SIZE 512 +FATFS FatFs0; +FATFS FatFs1; + +char chur_drv[3]; + DWORD get_fattime (void) { time_t timer; @@ -59,53 +77,55 @@ 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 - } } -/* Work register for fs command */ -static DWORD AccSize; -static WORD AccFiles, AccDirs; -#if _USE_LFN -char Lfname[_MAX_LFN+1]; -FILINFO Finfo = { - .lfname = Lfname, - .lfsize = sizeof Lfname - }; -#else -FILINFO Finfo; -#endif -static const FLASH char swirlchar[] = { '-','\\','|','/' }; +void setup_fatfs(void) +{ + f_mount(&FatFs0, "0:", 0); + f_mount(&FatFs1, "1:", 0); +} + static void swirl(void) { + static const FLASH char swirlchar[] = { '-','\\','|','/' }; static uint_fast8_t cnt; 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) + 300; + tstamp = get_timer(0) + 250; } } +/* 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 */ + char *path, /* Pointer to the working buffer with start path */ + struct stat_dat_s *statp ) { DIR dirs; @@ -117,23 +137,23 @@ FRESULT scan_files ( swirl(); 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); + 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; + if (res != FR_OK) + break; } else { -// printf_P(PSTR("%s/%s\n"), path, fn); - AccFiles++; - AccSize += Finfo.fsize; + //printf_P(PSTR("%s/%s\n"), path, fn); + statp->AccFiles++; + statp->AccSize += statp->Finfo.fsize; } if (check_abort()) { res = 255; @@ -150,74 +170,138 @@ FRESULT scan_files ( * fatstat path - Show logical drive status * */ -command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_stat(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { - FATFS *FatFs, *fs; + FATFS *fs; DWORD nfreeclst; FRESULT res; - char *buffer; + char *buf; + char *path = ""; + struct stat_dat_s statp; (void) cmdtp; (void) flag; (void) argc; - FatFs = (FATFS *) malloc(sizeof (FATFS)); - buffer = (char *) malloc(BUFFER_SIZE); - if (FatFs == NULL || buffer == NULL) { - printf_P(PSTR("fatstat: Out of Memory!\n")); - free(buffer); - free(FatFs); + buf = (char *) malloc(BUFFER_SIZE); + if (buf == NULL) { + printf_P(PSTR("fat stat: Out of Memory!\n")); return CMD_RET_FAILURE; } - res = f_mount(FatFs, argv[1], 0); + if (argc > 1) + path = argv[1]; + res = f_getfree(path, &nfreeclst, &fs); 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); + 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)); - } + 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) { - my_puts_P(PSTR("\nCounting... ")); - AccSize = AccFiles = AccDirs = 0; + if (!res) { + my_puts_P(PSTR("\nCounting... ")); + statp.AccSize = statp.AccFiles = statp.AccDirs = 0; + strcpy(buf, path); - strcpy(buffer, argv[1]); + res = scan_files(buf, &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 = scan_files(buffer); - } - if (!res) { - 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), nfreeclst * (fs->csize / 2) - ); - } + free(buf); + if (res) { + put_rc(res); + return CMD_RET_FAILURE; + } + return CMD_RET_SUCCESS; +} + +/* + * 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[]) +{ + FRESULT res; + char *buf; + + (void) cmdtp; (void) flag; (void) argc; (void) argv; + + buf = (char *) malloc(BUFFER_SIZE); + if (buf == NULL) { + printf_P(PSTR("pwd: Out of Memory!\n")); + free(buf); + return CMD_RET_FAILURE; + } + + 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; +} + + +/* + * cd - Change the current/working directory. + * + */ +command_ret_t do_cd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) +{ + char *arg; + FRESULT res = 0; + + (void) cmdtp; (void) flag; (void) argc; + + 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); + } + if (!res) { + res = f_chdir(arg); } - f_mount(NULL, argv[1], 0); - free(buffer); - free(FatFs); if (res) { put_rc(res); return CMD_RET_FAILURE; @@ -225,65 +309,99 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg return CMD_RET_SUCCESS; } +#define MAX_PATHLEN 255 + + /* Remove trailing slashes, + * but keep a leading slash (absolute path) + */ +void strip_trailing_slash_relpath(char *p) +{ + int n = strlen(p); + + if (n >= 2 && (p[0] & 0x38) == '0' && p[1] == ':') { + p += 2; + n -= 2; + } + if (n >= 1 && p[0] == '/') { + p++; + n--; + } + while (n-- != 0 && p[n] == '/') + p[n] = '\0'; +} + +int print_dirent(FILINFO *f) +{ + return 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); +} /* * fatls 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, uint_fast8_t flag, 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 - (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; + + char *path = ""; + if (argc > 1) + path = argv[1]; + strip_trailing_slash_relpath(path); + + char *p = strrchr(path, '/'); + if (p) + p++; + else { + p = path; + char *q = p; + if ((*q++ & 0x38) == '0' && *q++ == ':') + p = q; + } + + char *pattern = NULL; + if (strpbrk_P(p, PSTR("*?")) || + (f_stat(path, &Finfo) == FR_OK && !(Finfo.fattrib & AM_DIR))) { + pattern = strdup(p); + *p = '\0'; } + strip_trailing_slash_relpath(path); + +printf_P(PSTR("*: |%s| |%s|\n"), path ? path : "", pattern ? pattern : ""); p1 = s1 = s2 = 0; - for(;;) { - res = f_readdir(&Dir, &Finfo); - if ((res != FR_OK) || !Finfo.fname[0]) - break; + res = f_findfirst(&Dir, &Finfo, path, pattern ? pattern : "*"); /* Start to search for files */ + while (res == FR_OK && Finfo.fname[0]) { if (Finfo.fattrib & AM_DIR) { s2++; } else { s1++; p1 += Finfo.fsize; } - printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu "), - (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 + print_dirent(&Finfo); if (check_abort()) break; + res = f_findnext(&Dir, &Finfo); } + f_closedir(&Dir); + free(pattern); 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); } @@ -295,23 +413,107 @@ command_ret_t do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ return CMD_RET_SUCCESS; } +command_ret_t do_tst(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) +{ + DIR Dir; /* Directory object */ + FILINFO Finfo; + FRESULT res = FR_OK; + char *path; + + (void) cmdtp; (void) flag; + + printf_P(PSTR("sizeof DIR: %u, sizeof FIL: %u\n"), sizeof (DIR), sizeof (FILINFO)); + + char * buf = (char *) malloc(BUFFER_SIZE); + if (buf == NULL) { + printf_P(PSTR("pwd: Out of Memory!\n")); + free(buf); + return CMD_RET_FAILURE; + } + res = f_getcwd(buf, BUFFER_SIZE); /* Get current directory path */ + + if (!res) { + printf_P(PSTR("cwd: |%s|\n"), buf); + } + free(buf); + if (res) { + put_rc(res); + return CMD_RET_FAILURE; + } + + if (argc > 1) + path = argv[1]; + else + path = ""; + + printf_P(PSTR("arg: |%s|\n"), path); + printf_P(PSTR("==== f_stat: ")); + res = f_stat(path, &Finfo); + put_rc(res); + if (res == FR_OK) { + print_dirent(&Finfo); + } + + printf_P(PSTR("==== f_findfirst: ")); + res = f_findfirst(&Dir, &Finfo, path, "*"); /* Start to search for files */ + put_rc(res); + if (res == FR_OK) { + print_dirent(&Finfo); + } + f_closedir(&Dir); + + printf_P(PSTR("==== f_opendir: ")); + res = f_opendir(&Dir, path); + put_rc(res); + f_closedir(&Dir); + + return CMD_RET_SUCCESS; +} + +static +FRESULT mkpath(TCHAR *path) +{ + /* TODO: */ + (void) path; +#if 0 + FILINFO fd + TCHAR *p, *q; + FRESULT ret; + + res = f_stat (path, &fd) + + p = strchr(path, ':'); + if (p == NULL || *++p == '\0' || *p++ != '/') + return FR_OK; + + while ((q = strchr(p, '/')) != NULL) { + *q = '\0'; + ret = f_mkdir(path); + *q = '/'; + if (ret != FR_OK && ret != FR_EXIST) + return ret; + p = q + 1; + } +#endif + + return FR_OK; +} /* * 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, uint_fast8_t flag, 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; @@ -321,33 +523,33 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ 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 (dowrite) { + res = mkpath(argv[1]); + } if (!res) { res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS : FA_READ ); @@ -407,11 +609,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")); @@ -422,3 +622,232 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ return CMD_RET_SUCCESS; } + +/* ========================================================================== */ + + +typedef struct { + char *p_end; /* pointer to NULL at end of path */ + char p_path[MAX_PATHLEN + 1]; /* pointer to the start of a path */ +} PATH_T; + +static inline void strip_trailing_slash(PATH_T *p) +{ + while (p->p_end > p->p_path && p->p_end[-1] == '/') + *--p->p_end = 0; +} + +/* + * Move specified string into path. Convert "" to "." to handle BSD + * semantics for a null path. Strip trailing slashes. + */ +int +path_set(PATH_T *p, char *string) +{ + if (strlen(string) > MAX_PATHLEN) { + //err("%s: name too long", string); + return(0); + } + + (void)strcpy(p->p_path, string); + p->p_end = p->p_path + strlen(p->p_path); + + if (p->p_path == p->p_end) { + *p->p_end++ = '.'; + *p->p_end = 0; + } + + strip_trailing_slash(p); + return(1); +} + +#define R_FLAG (1<<0) +#define I_FLAG (1<<1) +#define N_FLAG (1<<2) +#define F_FLAG (1<<3) +#define P_FLAG (1<<4) +#define V_FLAG (1<<5) + +command_ret_t do_cp(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[]) +{ + + FRESULT fr; /* Return value */ + DIR dj; /* Directory search object */ + FILINFO fno; /* File information */ + + uint8_t flags = 0; + + + /* reset getopt() */ + optind = 0; + + int opt; + while ((opt = getopt(argc, argv, PSTR("Rrfip"))) != -1) { + switch (opt) { + case 'f': + flags &= I_FLAG; + break; + case 'i': + flags |= I_FLAG; + flags &= F_FLAG; + break; + case 'p': + flags |= P_FLAG; + break; + case 'R': + case 'r': + flags |= R_FLAG; + break; + case 'v': + flags |= V_FLAG; + break; + default: + return CMD_RET_USAGE; + break; + } + } + argc -= optind; + argv += optind; + + if (argc < 2) + return CMD_RET_USAGE; + +#if 0 + /* consume last argument first. */ + if (!path_set(&to, argv[--argc])) + exit(1); + + + if (flags & V_FLAG) + printf_P((PSTR("%s %s -> %s\n", badcp ? : "ERR:" : " ", + curr->fts_path, to.p_path); +#endif + +/* Search a directory for objects and display it */ + + + fr = f_findfirst(&dj, &fno, argv[1], argv[2]); /* Start to search for files */ + + while (fr == FR_OK && fno.fname[0]) { /* Repeat while an item is found */ + printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %s\n"), + (fno.fattrib & AM_DIR) ? 'D' : '-', + (fno.fattrib & AM_RDO) ? 'R' : '-', + (fno.fattrib & AM_HID) ? 'H' : '-', + (fno.fattrib & AM_SYS) ? 'S' : '-', + (fno.fattrib & AM_ARC) ? 'A' : '-', + (fno.fdate >> 9) + 1980, (fno.fdate >> 5) & 15, fno.fdate & 31, + (fno.ftime >> 11), (fno.ftime >> 5) & 63, + fno.fsize, fno.fname); + fr = f_findnext(&dj, &fno); /* Search for next item */ + } + + f_closedir(&dj); + + return CMD_RET_SUCCESS; +} + + +static +command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]); + +cmd_tbl_t cmd_tbl_fat[] = { +CMD_TBL_ITEM( + stat, 2, CTBL_REPEAT, do_stat, + "Show logical drive status", + "dev" +), +CMD_TBL_ITEM( + pwd, 2, CTBL_REPEAT, do_pwd, + "Print name of current/working directory", + "" +), +CMD_TBL_ITEM( + cd, 2, CTBL_REPEAT, do_cd, + "Change the current/working directory.", + "path" +), +CMD_TBL_ITEM( + ls, 2, CTBL_REPEAT, do_ls, + "Directory listing", + "path" +), +CMD_TBL_ITEM( + tst, 2, CTBL_REPEAT, do_tst, + "FatFS test function", + "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( + cp, CONFIG_SYS_MAXARGS, 0, do_cp, + "copy files", + "cp [-R] [-f | -i | -n] [-aprv] source_file target_file\n" + " - \n" +), + +CMD_TBL_ITEM( + help, CONFIG_SYS_MAXARGS, CTBL_REPEAT, 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 */ +{ 0 }, +}; + +static +command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) +{ + return _do_help(cmd_tbl_fat, cmdtp, flag, argc, argv); +} + + +command_ret_t do_fat(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) +{ + cmd_tbl_t *cp; + + if (argc < 2) + return CMD_RET_USAGE; + + /* drop initial "fat" arg */ + argc--; + argv++; + + cp = find_cmd(argv[0], cmd_tbl_fat); + + if (cp) + return cp->cmd(cmdtp, flag, argc, argv); + + return CMD_RET_USAGE; +}