diff options
| -rw-r--r-- | avr/Tupfile | 2 | ||||
| -rw-r--r-- | avr/cmd_fat.c | 387 | ||||
| -rw-r--r-- | avr/cmd_sd.c | 51 | ||||
| -rw-r--r-- | avr/command_tbl.c | 33 | ||||
| -rw-r--r-- | fatfs/src/ffconf.h | 4 |
5 files changed, 423 insertions, 54 deletions
diff --git a/avr/Tupfile b/avr/Tupfile index a50b3b9..11b5802 100644 --- a/avr/Tupfile +++ b/avr/Tupfile @@ -4,7 +4,7 @@ PROG = stamp-monitor SRC = main.c SRC += cli.c cli_readline.c command.c command_tbl.c SRC += cmd_help.c cmd_date.c cmd_mem.c cmd_boot.c cmd_gpio.c cmd_misc.c -SRC += cmd_sd.c +SRC += cmd_sd.c cmd_fat.c SRC += env.c xmalloc.c date.c con-utils.c print-utils.c getopt-min.c SRC += timer.c serial.c i2c.c pcf8583.c mmc.c SRC += background.c z180-serv.c z80-if.c gpio.c diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c new file mode 100644 index 0000000..9222c1b --- /dev/null +++ b/avr/cmd_fat.c @@ -0,0 +1,387 @@ +#include "common.h" +#include <stdlib.h> +#include <string.h> +#include <stdbool.h> + +#include "command.h" +#include "ff.h" +#include "z80-if.h" +#include "print-utils.h" +#include "timer.h" + + +DWORD get_fattime (void) +{ + return 0; +} + + +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) +{ +#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 +} + +/* Work register for fs command */ +static DWORD AccSize; +static WORD AccFiles, AccDirs; +FILINFO Finfo; + +static +FRESULT scan_files ( + char* path /* Pointer to the working buffer with start path */ +) +{ + DIR dirs; + FRESULT res; + int i; + 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]) { + 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; + } + } + } + + return res; +} + + +/* + * fatstat path - Show logical drive status + * + */ +command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + FATFS FatFs, *fs; + DWORD p1, p2; + FRESULT res; + char buffer[512]; + + (void) cmdtp; (void) flag; (void) argc; + + 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; + } + + 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; + + strcpy(buffer, argv[1]); + + 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; +} + + +/* + * fatls path - Directory listing + * + */ +command_ret_t do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + FATFS 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; + } + + p1 = s1 = s2 = 0; + for(;;) { + res = f_readdir(&Dir, &Finfo); + if ((res != FR_OK) || !Finfo.fname[0]) + break; + 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 %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 + } + + 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) + printf_P(PSTR(", %10luK bytes free\n"), p1 * fs->csize / 2); + } + + if (res) { + put_rc(res); + return CMD_RET_FAILURE; + } + + return CMD_RET_SUCCESS; +} + + +/* + * fatread - load binary file from a dos filesystem + * <d:/path/filename> <addr> [bytes [pos]] + */ +command_ret_t do_fat_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + 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]; + + (void) cmdtp; (void) flag; + + if (argc < 3) + 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); + + res = f_mount(&FatFs, argv[1], 0); + if (!res) { + res = f_open(&File, argv[1], FA_READ); + + 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; + + 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); + } + } + f_mount(NULL, argv[1], 0); + } + + if (buserr) + my_puts_P(PSTR("Bus timeout\n")); + if (res) + put_rc(res); + if (buserr || res) + return CMD_RET_FAILURE; + + return CMD_RET_SUCCESS; +} + +/* + * fatwrite - write file into a dos filesystem + * <d:/path/filename> <addr> <bytes> + */ +command_ret_t do_fat_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + FATFS FatFs; + FIL File; + unsigned long bytes; + unsigned long bytes_written; + uint32_t addr; + FRESULT res; + bool buserr = 0; + uint32_t timer; + uint8_t buffer[512]; + + (void) cmdtp; (void) flag; + + if (argc < 4) + return CMD_RET_USAGE; + + addr = strtoul(argv[2], 0, 16); + bytes = strtoul(argv[3], 0, 16); + + res = f_mount(&FatFs, argv[1], 0); + if (!res) { + res = f_open(&File, argv[1], FA_CREATE_ALWAYS | FA_WRITE); + if (!res) { + bytes_written = 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; + } + 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; + addr += br; + bytes_written += br; + if (cnt != br) + break; + } + res = f_close(&File); + timer = get_timer(timer); + printf_P(PSTR("%lu bytes written with %lu bytes/sec.\n"), + bytes_written, timer ? (bytes_written * 1000 / timer) : 0); + } + f_mount(NULL, argv[1], 0); + } + + if (buserr) + my_puts_P(PSTR("Bus timeout\n")); + if (res) + put_rc(res); + if (buserr || res) + return CMD_RET_FAILURE; + + return CMD_RET_SUCCESS; +} diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c index 2ccf024..5494a13 100644 --- a/avr/cmd_sd.c +++ b/avr/cmd_sd.c @@ -8,43 +8,6 @@ #include "print-utils.h" -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) -{ -#if 0 - printf_P(PSTR("rc=%u FR_%S\n"), rc, rc_names[rc]); -#else - printf_P(PSTR("rc=%u FR_"), rc); - my_puts_P(rc_names[rc]); - my_puts_P(PSTR("\n")); - -#endif - -} - - /* * di <pd#> - Initialize disk * @@ -100,33 +63,19 @@ command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ if (disk_ioctl(dev, GET_SECTOR_COUNT, &dat.ul) == RES_OK) printf_P(PSTR("Drive size: %lu sectors\n"), dat.ul); - if (disk_ioctl(dev, GET_BLOCK_SIZE, &dat.ul) == RES_OK) printf_P(PSTR("Erase block: %lu sectors\n"), dat.ul); - if (disk_ioctl(dev, MMC_GET_TYPE, &dat.uc) == RES_OK) printf_P(PSTR("Card type: %u\n"), dat.uc); - if (disk_ioctl(dev, MMC_GET_CSD, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 16, "CSD:"); - if (disk_ioctl(dev, MMC_GET_CID, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 16, "CID:"); - if (disk_ioctl(dev, MMC_GET_OCR, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 4, "OCR:"); - if (disk_ioctl(dev, MMC_GET_SDSTAT, dat.uca) == RES_OK) dump_ram(dat.uca, 0, 64, "SD Status:"); - if (disk_ioctl(dev, ATA_GET_MODEL, dat.uca) == RES_OK) { - dat.uca[40] = '\0'; - printf_P(PSTR("Model: %s\n"), dat.uca); - } - if (disk_ioctl(dev, ATA_GET_SN, dat.uca) == RES_OK) { - dat.uca[20] = '\0'; printf_P(PSTR("S/N: %s\n"), dat.uca); - } - return CMD_RET_SUCCESS; } diff --git a/avr/command_tbl.c b/avr/command_tbl.c index 61c61a6..02d8ac8 100644 --- a/avr/command_tbl.c +++ b/avr/command_tbl.c @@ -22,6 +22,10 @@ extern command_ret_t do_busreq_pulse(cmd_tbl_t *, int, int, char * const []); extern command_ret_t do_date(cmd_tbl_t *, int, int, char * const []); extern command_ret_t do_gpio(cmd_tbl_t *, int, int, char * const []); extern command_ret_t do_sd(cmd_tbl_t *, int, int, char * const []); +extern command_ret_t do_fat_stat(cmd_tbl_t *, int, int, char * const []); +extern command_ret_t do_fat_ls(cmd_tbl_t *, int, int, char * const []); +extern command_ret_t do_fat_read(cmd_tbl_t *, int, int, char * const []); +extern command_ret_t do_fat_write(cmd_tbl_t *, int, int, char * const []); #ifdef CONFIG_SYS_LONGHELP const FLASH char sd_help_text[] = @@ -240,6 +244,35 @@ CMD_TBL_ITEM( ), CMD_TBL_ITEM( + fatstat, 2, 1, do_fat_stat, + "Show logical drive status", + "dev" +), +CMD_TBL_ITEM( + fatls, 2, 1, do_fat_ls, + "Directory listing", + "path" +), +CMD_TBL_ITEM( + fatload, 5, 0, do_fat_read, + "load binary file from a dos filesystem", + "<d:/path/filename> <addr> [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( + fatwrite, 4, 0, do_fat_write, + "write file into a dos filesystem", + "<d:/path/filename> <addr> <bytes>\n" + " - write file 'filename' from the address 'addr' in RAM\n" + " to 'dev' on 'interface'" +), + +CMD_TBL_ITEM( help, CONFIG_SYS_MAXARGS, 1, do_help, "print command description/usage", "\n" diff --git a/fatfs/src/ffconf.h b/fatfs/src/ffconf.h index adc4b87..059e85b 100644 --- a/fatfs/src/ffconf.h +++ b/fatfs/src/ffconf.h @@ -97,7 +97,7 @@ / 1 - ASCII (No extended character. Valid for only non-LFN configuration.) */ -#define _USE_LFN 1 +#define _USE_LFN 0 #define _MAX_LFN 128 /* The _USE_LFN option switches the LFN feature. / @@ -145,7 +145,7 @@ / Drive/Volume Configurations /---------------------------------------------------------------------------*/ -#define _VOLUMES 1 +#define _VOLUMES 2 /* Number of volumes (logical drives) to be used. */ |