LFN support

2 files changed, 22 insertions, 8 deletions

diff --git a/avr/Tupfile b/avr/Tupfile
index 11b5802..1c0f7ed 100644
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -1,6 +1,9 @@
 include_rules
 
 PROG		= stamp-monitor
+
+FATFS	= $(TOP)/fatfs/src/ff.c
+
 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
@@ -8,7 +11,7 @@ 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
-SRC		+= $(TOP)/fatfs/src/ff.c
+SRC		+= $(FATFS) $(TOP)/fatfs/src/option/unicode.c
 
 SRC_Z		= ../z180/hdrom.c
 
@@ -59,9 +62,9 @@ CFLAGS	+= -fno-split-wide-types
 CFLAGS	+= -fshort-enums
 
 #CFLAGS	+=  -fdiagnostics-color=always
-
 #CFLAGS	+= -save-temps
 
+CFLAGS_$(FATFS)	= -fno-strict-aliasing
 
 CFLAGS	+= $(INCLUDES)
 
@@ -72,7 +75,7 @@ LDFLAGS	+= -Wl,--gc-sections
 LDFLAGS	+= -Wl,--cref
 
 
-!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) -c %f -o %o |> %B.o
+!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) $(CFLAGS_%f) -c %f -o %o |> %B.o
 !LINK = |> ^ LINK %o^ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-Map=%O.map %f $(LDLIBS) -o %o |> | %O.map
 !OBJCOPY= |> ^ OBJCOPY %o^ $(OBJCOPY) -Oihex %f %o |>
 !OBJDUMP= |> ^ OBJDUMP %o^ $(OBJDUMP) -h -S %f > %o |> %O.lss
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);