Add get_fattime(), move buffers from stack to heap

2 files changed, 37 insertions, 167 deletions

diff --git a/avr/Tupfile b/avr/Tupfile
index 9fc0739..78e9744 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -16,6 +16,7 @@ SRC		+= $(FATFS) $(TOP)/fatfs/src/option/unicode.c
 #TODO: time lib
 SRC		+= ../time/asctime_r.c ../time/gmtime_r.c ../time/mk_gmtime.c
 SRC		+= ../time/print_lz.c ../time/isLeap.c
+SRC		+= ../time/time.c ../time/fatfs_time.c
 SRC		+= ../time/system_time.c ../time/set_system_time.c
 
 ASRC	+= ../time/system_tick.S
diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c
index 0232f5d..9db3b0a 100644
--- a/avr/cmd_fat.c
+++ b/avr/cmd_fat.c
@@ -8,16 +8,24 @@
 #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);
 }
 
 
@@ -121,11 +129,11 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 	(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;
 	}
 
@@ -177,6 +185,8 @@ command_ret_t do_fat_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 	}
 
 	f_mount(NULL, argv[1], 0);
+	free(buffer);
+	free(FatFs);
 	if (res) {
 		put_rc(res);
 		return CMD_RET_FAILURE;
@@ -223,21 +233,18 @@ 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  %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
 	}
 
@@ -257,163 +264,13 @@ command_ret_t do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 
 
 /*
- * 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]]
  *		write <d:/path/filename> <addr> <bytes>
  */
 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;
@@ -424,7 +281,7 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 	FRESULT res;
 	bool buserr = 0;
 	uint32_t timer;
-	uint8_t buffer[512];
+	uint8_t *buffer;
 
 	(void) cmdtp; (void) flag;
 
@@ -448,7 +305,16 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 	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 );
@@ -461,9 +327,9 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 				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;
 					}
@@ -513,6 +379,9 @@ command_ret_t do_fat_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 		f_mount(NULL, argv[1], 0);
 	}
 
+	free(buffer);
+	free(FatFs);
+
 	if (buserr)
 		my_puts_P(PSTR("Bus timeout\n"));
 	if (res)