diff options
Diffstat (limited to 'avr/cmd_fat.c')
| -rw-r--r-- | avr/cmd_fat.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index 9222c1b..1c46dd1 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -8,6 +8,7 @@ #include "z80-if.h" #include "print-utils.h" #include "timer.h" +#include "debug.h" DWORD get_fattime (void) @@ -53,7 +54,15 @@ void put_rc (FRESULT rc) /* 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 FRESULT scan_files ( @@ -66,6 +75,7 @@ FRESULT scan_files ( char *fn; res = f_opendir(&dirs, path); + if (res == FR_OK) { i = strlen(path); while (((res = f_readdir(&dirs, &Finfo)) == FR_OK) && Finfo.fname[0]) { @@ -100,7 +110,7 @@ FRESULT scan_files ( command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { FATFS FatFs, *fs; - DWORD p1, p2; + DWORD clusters; FRESULT res; char buffer[512]; @@ -108,7 +118,7 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg res = f_mount(&FatFs, argv[1], 0); if (!res) - res = f_getfree(argv[1], &p2, &fs); + res = f_getfree(argv[1], &clusters, &fs); if (res) { put_rc(res); return CMD_RET_FAILURE; @@ -130,7 +140,8 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg #if _USE_LABEL TCHAR label[12]; - res = f_getlabel(argv[1], label, &p1); + DWORD serial; + res = f_getlabel(argv[1], label, &serial); if (res) { put_rc(res); return CMD_RET_FAILURE; @@ -138,7 +149,7 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg printf_P(PSTR( "Volume name: %s\n" "Volume S/N: %04X-%04X\n"), - label, (WORD)((DWORD)p1 >> 16), (WORD)(p1 & 0xFFFF)); + label, (WORD)(serial >> 16), (WORD)(serial & 0xFFFF)); #endif my_puts_P(PSTR("\n...")); AccSize = AccFiles = AccDirs = 0; @@ -153,7 +164,7 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg 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) + (fs->n_fatent - 2) * (fs->csize / 2), clusters * (fs->csize / 2) ); res = f_mount(NULL, argv[1], 0); |