cmd_fat.c: reorg

# Conflicts:
#	avr/cmd_fat.c

1 files changed, 146 insertions, 153 deletions

diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c
index b083456..9750c38 100644
--- a/avr/cmd_fat.c
+++ b/avr/cmd_fat.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2014,2016 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014,2016,2018 Leo C. <erbl259-lmu@yahoo.de>
  *
  * SPDX-License-Identifier:	GPL-2.0
  */
@@ -20,15 +20,23 @@
 #include "debug.h"
 #include "env.h"
 
-/* TODO: use memory size test function (cmd_mem.c) */
-#define MAX_MEMORY	(1ul << 19)
+/* TODO: use memory size test function (detect_ramsize() in cmd_loadihex.c) */
+/* TODO: detect_ramsize() should be moved to z80-if.c */
+#define MAX_MEMORY	CONFIG_SYS_RAMSIZE_MAX
 #define BUFFER_SIZE	512
 
-
+/*
+ * Multible (fat) partitions per physical drive are not supported,
+ * but we have up to 2 sdcard slots.
+ */
 FATFS FatFs0;
 FATFS FatFs1;
 
-char chur_drv[3];
+void setup_fatfs(void)
+{
+	f_mount(&FatFs0, "0:", 0);
+	f_mount(&FatFs1, "1:", 0);
+}
 
 DWORD get_fattime (void)
 {
@@ -90,13 +98,6 @@ void put_rc (FRESULT rc)
 }
 
 
-void setup_fatfs(void)
-{
-	f_mount(&FatFs0, "0:", 0);
-	f_mount(&FatFs1, "1:", 0);
-}
-
-
 static void swirl(void)
 {
 	static const FLASH char swirlchar[] = { '-','\\','|','/' };
@@ -110,140 +111,15 @@ static void swirl(void)
 	}
 }
 
-/* Work register for fs command */
-struct stat_dat_s {
-	DWORD AccSize;
-	WORD  AccFiles, AccDirs;
-	FILINFO Finfo;
-};
-
-static
-FRESULT scan_files (
-	char *path,			/* Pointer to the working buffer with start path */
-	struct stat_dat_s *statp
-)
-{
-	DIR dirs;
-	FRESULT res;
-	int i;
-	char *fn;
-
-	res = f_opendir(&dirs, path);
-	swirl();
-	if (res == FR_OK) {
-		i = strlen(path);
-		while (((res = f_readdir(&dirs, &statp->Finfo)) == FR_OK) &&
-					statp->Finfo.fname[0]) {
-			if (FF_FS_RPATH && statp->Finfo.fname[0] == '.')
-				continue;
-			fn = statp->Finfo.fname;
-			if (statp->Finfo.fattrib & AM_DIR) {
-				statp->AccDirs++;
-				path[i] = '/';
-				strcpy(path+i+1, fn);
-				res = scan_files(path, statp);
-				path[i] = '\0';
-				if (res != FR_OK)
-					break;
-			} else {
-				//printf_P(PSTR("%s/%s\n"), path, fn);
-				statp->AccFiles++;
-				statp->AccSize += statp->Finfo.fsize;
-			}
-			if (check_abort()) {
-				res = 255;
-				break;
-			}
-		}
-	}
-
-	return res;
-}
-
-
-/*
- * fatstat path - Show logical drive status
- *
- */
-command_ret_t do_stat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
-{
-	FATFS *fs;
-	DWORD nfreeclst;
-	FRESULT res;
-	char *path;
-	struct stat_dat_s statp;
-
-	(void) cmdtp; (void) flag; (void) argc;
-
-	path = (char *) malloc(BUFFER_SIZE);
-	if (path == NULL) {
-		printf_P(PSTR("fat stat: Out of Memory!\n"));
-		free(path);
-		return CMD_RET_FAILURE;
-	}
-
-	res = f_getfree(argv[1], &nfreeclst, &fs);
-	if (!res) {
-		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];
-		DWORD serial;
-		res = f_getlabel(argv[1], label, &serial);
-		if (!res) {
-			printf_P(PSTR(
-						"Volume name:             %s\n"
-						"Volume S/N:              %04X-%04X\n"),
-					label, (WORD)(serial >> 16), (WORD)(serial & 0xFFFF));
-		}
-#endif
-		if (!res) {
-			my_puts_P(PSTR("\nCounting...  "));
-			statp.AccSize = statp.AccFiles = statp.AccDirs = 0;
-			strcpy(path, argv[1]);
-
-			res = scan_files(path, &statp);
-		}
-		if (!res) {
-			printf_P(PSTR("\r%u files, %lu bytes.\n%u folders.\n"
-						 "%lu KB total disk space.\n%lu KB available.\n"),
-					statp.AccFiles, statp.AccSize, statp.AccDirs,
-					(fs->n_fatent - 2) * (fs->csize / 2), nfreeclst * (fs->csize / 2)
-			);
-		}
-	}
-
-	free(path);
-	if (res) {
-		put_rc(res);
-		return CMD_RET_FAILURE;
-	}
-	return CMD_RET_SUCCESS;
-}
-
 /*
  * pwd - Print current directory of the current drive.
  *
  */
-command_ret_t do_pwd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
+command_ret_t do_pwd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
 	FRESULT res;
 	char *buf;
 
-	(void) cmdtp; (void) flag; (void) argc; (void) argv;
-
 	buf = (char *) malloc(BUFFER_SIZE);
 	if (buf == NULL) {
 		printf_P(PSTR("pwd: Out of Memory!\n"));
@@ -269,13 +145,11 @@ command_ret_t do_pwd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
  * cd - Change the current/working directory.
  *
  */
-command_ret_t do_cd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
+command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
 	char *arg;
 	FRESULT res = 0;
 
-	(void) cmdtp; (void) flag; (void) argc;
-
 	if (argc < 2) {
 		arg = getenv_str(PSTR(ENV_HOME));
 		if (arg == NULL) {
@@ -305,10 +179,10 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 
 
 /*
- * fatls path - Directory listing
+ * ls path - Directory listing
  *
  */
-command_ret_t do_ls(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
+command_ret_t do_ls(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
 	FATFS *fs;
 	DIR Dir;					/* Directory object */
@@ -318,7 +192,6 @@ command_ret_t do_ls(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 	FRESULT res = FR_OK;
 	char *buf;
 
-	(void) cmdtp; (void) flag; (void) argc;
 
 	buf = (char *) malloc(BUFFER_SIZE);
 	if (buf == NULL) {
@@ -378,12 +251,12 @@ command_ret_t do_ls(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 	return CMD_RET_SUCCESS;
 }
 
+#if 0
 static
 FRESULT mkpath(TCHAR *path)
 {
 	/* TODO: */
 	(void) path;
-#if 0
 	FILINFO fd
 	TCHAR *p, *q;
 	FRESULT ret;
@@ -402,17 +275,139 @@ FRESULT mkpath(TCHAR *path)
 				return ret;
 		p = q + 1;
 	}
-#endif
 
 	return FR_OK;
 }
+#endif
+
+/* Work register for fs command */
+struct stat_dat_s {
+	DWORD AccSize;
+	WORD  AccFiles, AccDirs;
+	FILINFO Finfo;
+};
+
+static
+FRESULT scan_files (
+	char *path,			/* Pointer to the working buffer with start path */
+	struct stat_dat_s *statp
+)
+{
+	DIR dirs;
+	FRESULT res;
+	int i;
+	char *fn;
+
+	res = f_opendir(&dirs, path);
+	swirl();
+	if (res == FR_OK) {
+		i = strlen(path);
+		while (((res = f_readdir(&dirs, &statp->Finfo)) == FR_OK) &&
+					statp->Finfo.fname[0]) {
+			if (FF_FS_RPATH && statp->Finfo.fname[0] == '.')
+				continue;
+			fn = statp->Finfo.fname;
+			if (statp->Finfo.fattrib & AM_DIR) {
+				statp->AccDirs++;
+				path[i] = '/';
+				strcpy(path+i+1, fn);
+				res = scan_files(path, statp);
+				path[i] = '\0';
+				if (res != FR_OK)
+					break;
+			} else {
+				//printf_P(PSTR("%s/%s\n"), path, fn);
+				statp->AccFiles++;
+				statp->AccSize += statp->Finfo.fsize;
+			}
+			if (check_abort()) {
+				res = 255;
+				break;
+			}
+		}
+	}
+
+	return res;
+}
+
+
+/*
+ * fatstat path - Show logical drive status
+ *
+ */
+command_ret_t do_stat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
+{
+	FATFS *fs;
+	DWORD nfreeclst;
+	FRESULT res;
+	char *buf;
+	char *path = "";
+	struct stat_dat_s statp;
+
+	buf = (char *) malloc(BUFFER_SIZE);
+	if (buf == NULL) {
+		printf_P(PSTR("fat stat: Out of Memory!\n"));
+		return CMD_RET_FAILURE;
+	}
+
+	if (argc > 1)
+		path = argv[1];
+	res = f_getfree(path, &nfreeclst, &fs);
+	if (!res) {
+		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
+		DWORD serial;
+		res = f_getlabel(path, buf, &serial);
+		if (!res) {
+			printf_P(PSTR(
+						"Volume name:             %s\n"
+						"Volume S/N:              %04X-%04X\n"),
+					buf, (WORD)(serial >> 16), (WORD)(serial & 0xFFFF));
+		}
+#endif
+		if (!res) {
+			my_puts_P(PSTR("\nCounting...  "));
+			statp.AccSize = statp.AccFiles = statp.AccDirs = 0;
+			strcpy(buf, path);
+
+			res = scan_files(buf, &statp);
+		}
+		if (!res) {
+			printf_P(PSTR("\r%u files, %lu bytes.\n%u folders.\n"
+						 "%lu KB total disk space.\n%lu KB available.\n"),
+					statp.AccFiles, statp.AccSize, statp.AccDirs,
+					(fs->n_fatent - 2) * (fs->csize / 2), nfreeclst * (fs->csize / 2)
+			);
+		}
+	}
+
+	free(buf);
+	if (res) {
+		put_rc(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_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
+command_ret_t do_rw(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
 	FIL File;
 	uint32_t addr;
@@ -426,8 +421,6 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 	uint32_t timer;
 	uint8_t *buffer;
 
-	(void) cmdtp; (void) flag;
-
 	if (argc < (dowrite ? 4 : 3))
 		return CMD_RET_USAGE;
 
@@ -455,9 +448,6 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 		return CMD_RET_FAILURE;
 	}
 
-	if (dowrite) {
-		res = mkpath(argv[1]);
-	}
 	if (!res) {
 		res = f_open(&File, argv[1], dowrite ? FA_WRITE | FA_CREATE_ALWAYS
 											 : FA_READ );
@@ -531,6 +521,9 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 	return CMD_RET_SUCCESS;
 }
 
+/*
+ * command table for fat subcommands
+ */
 
 cmd_tbl_t cmd_tbl_fat[] = {
 CMD_TBL_ITEM(
@@ -597,7 +590,7 @@ CMD_TBL_END(cmd_tbl_fat)
 };
 
 
-command_ret_t do_fat(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
+command_ret_t do_fat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
 	puts_P(PSTR("Huch?"));