#include "z80-if.h"
#include "con-utils.h"
#include "print-utils.h"
+#include "time.h"
#include "timer.h"
#include "debug.h"
#define MAX_MEMORY (1ul << 20)
+#define BUFFER_SIZE 512
+
DWORD get_fattime (void)
{
- /* TODO: */
- return 0;
+ time_t timer;
+ struct tm tm_timer;
+
+ time(&timer);
+ gmtime_r(&timer, &tm_timer);
+
+ return fatfs_time(&tm_timer);
+}
+
+
+static bool check_abort(void)
+{
+ bool ret = ctrlc();
+
+ if (ret)
+ printf_P(PSTR("Abort\n"));
+
+ return ret;
}
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_names[rc]);
+ 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_names[rc]);
#endif
+ }
}
/* Work register for fs command */
FILINFO Finfo;
#endif
+static const FLASH char swirlchar[] = { '-','\\','|','/' };
+
+static void swirl(void)
+{
+ 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;
+ }
+}
+
static
FRESULT scan_files (
char* path /* Pointer to the working buffer with start path */
char *fn;
res = f_opendir(&dirs, path);
-
+ swirl();
if (res == FR_OK) {
i = strlen(path);
while (((res = f_readdir(&dirs, &Finfo)) == FR_OK) && Finfo.fname[0]) {
AccFiles++;
AccSize += Finfo.fsize;
}
+ if (check_abort()) {
+ res = 255;
+ break;
+ }
}
}
(void) cmdtp; (void) flag; (void) argc;
FatFs = (FATFS *) malloc(sizeof (FATFS));
- buffer = (char *) malloc(512);
+ buffer = (char *) malloc(BUFFER_SIZE);
if (FatFs == NULL || buffer == NULL) {
printf_P(PSTR("fatstat: Out of Memory!\n"));
- free(FatFs);
free(buffer);
+ free(FatFs);
return CMD_RET_FAILURE;
}
}
#endif
if (!res) {
- my_puts_P(PSTR("\n..."));
+ my_puts_P(PSTR("\nCounting... "));
AccSize = AccFiles = AccDirs = 0;
strcpy(buffer, argv[1]);
}
f_mount(NULL, argv[1], 0);
+ free(buffer);
+ free(FatFs);
if (res) {
put_rc(res);
return CMD_RET_FAILURE;
} else {
s1++; p1 += Finfo.fsize;
}
- printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %s"),
+ 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, &(Finfo.fname[0]));
+ (Finfo.ftime >> 11), (Finfo.ftime >> 5) & 63, Finfo.fsize);
#if _USE_LFN
- for (int i = strlen(Finfo.fname); i < 14; i++)
- putchar(' ');
- printf_P(PSTR("%s\n"), Lfname);
+ printf_P(PSTR("%s\n"), *Lfname ? Lfname : Finfo.fname);
#else
- putchar('\n');
+ printf_P(PSTR("%s\n"), Finfo.fname);
#endif
+ if (check_abort())
+ break;
}
if (res == FR_OK) {
}
-/*
- * 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;
-}
-
/*
* fatread/write - load binary file to/from a dos filesystem
* read <d:/path/filename> <addr> [bytes [pos]]
*/
command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- FATFS FatFs;
+ FATFS *FatFs;
FIL File;
uint32_t addr;
unsigned long bytes;
FRESULT res;
bool buserr = 0;
uint32_t timer;
- uint8_t buffer[512];
+ uint8_t *buffer;
(void) cmdtp; (void) flag;
if (addr + bytes > MAX_MEMORY)
bytes = MAX_MEMORY - addr;
- res = f_mount(&FatFs, argv[1], 0);
+ FatFs = (FATFS *) malloc(sizeof (FATFS));
+ buffer = (uint8_t *) malloc(BUFFER_SIZE);
+ if (FatFs == NULL || 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) {
res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS
: FA_READ );
while (bytes) {
unsigned int cnt, br;
- if (bytes >= sizeof buffer) {
- cnt = sizeof buffer;
- bytes -= sizeof buffer;
+ if (bytes >= BUFFER_SIZE) {
+ cnt = BUFFER_SIZE;
+ bytes -= BUFFER_SIZE;
} else {
cnt = bytes; bytes = 0;
}
printf_P(PSTR("Disk full?\n"));
break;
}
- if (ctrlc()) {
- printf_P(PSTR("Abort\n"));
+ if (check_abort())
break;
- }
}
FRESULT fr = f_close(&File);
f_mount(NULL, argv[1], 0);
}
+ free(buffer);
+ free(FatFs);
+
if (buserr)
my_puts_P(PSTR("Bus timeout\n"));
if (res)
projects / z180-stamp.git / blobdiff