Read/write VFAT support from Rockbox-3.3 FAT stack

Add read/write VFAT support from Rockbox-3.3 FAT stack.
It should be also applicable to the unmodified 2009.11 U-Boot release.

Note that is was taken as is from Rockbox and from a older U-Boot
Rockbox patch. "checkpatch" shows very many coding style errors and
warnings, but it is tedious work to clean this up.

To make this patch work an additional mmc_block_write() board support
routine and the errno variable are needed.
Furthermore following defines in the board config header file:
	#define CONFIG_ROCKBOX_FAT	1
	#define CONFIG_U_BOOT		1
	#define CONFIG_SUPPORT_VFAT	1
	#define CONFIG_CMD_TREE_FAT
This will be added in a follow-up patch.

This patch is based on the patch from Etienne Carriere
<etienne.carriere@stericsson.com> for the U671x U-Boot:

This commit adds FAT write support to u-boot native read-only FAT code.
Commit initially applied on u-boot-v2009.01
(SHA1: 72d15e705bc3983884105cb7755c7ba80e74a0a5)

Based on FAT stack dumped from Rockbox package v3.1 (www.rockbox.org).
Based on initial Rockbox FAT stack integration in u-boot by Keith Outwater
(outwater@comcast.net).
Current porting is aligned with Rockbox v3.3 FAT stack.

Enable upon config switches:
CONFIG_CMD_FAT
CONFIG_ROCKBOX_FAT
CONFIG_CMD_TREE_FAT   (recommended)
CONFIG_SUPPORT_VFAT   (recommended)

C code APIs (from U-boot native FAT support):
int  fat_register_device(block_dev_desc_t *dev_desc, int part_no);
long file_fat_read(const char *path, void *buf, unsigned long maxsize);
int file_fat_ls(const char *dirname);
int file_fat_detectfs(void);

C code APIs (added by Rockbox FAT support):
long file_fat_write(const char *path, void *buf, unsigned long maxsize);
int file_fat_rm(const char *path);
int file_fat_rmdir(const char *path);
int file_fat_mkdir(const char *path);
int file_fat_cd(const char *path);
int file_fat_pwd(void);
int file_fat_mv(const char *oldpath, const char *newpath);
unsigned int rockbox_fat_free(unsigned long size_kbyte);
unsigned int rockbox_fat_size(void);

Use "help fat" from u-boot console to see available commands.

ST-Ericsson ID: WP264488

Change-Id: I9afc29ecb80f9152bd8534bbf11e47e54cfad796
Signed-off-by: Michael Brandt <michael.brandt@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/3009

3 files changed, 37 insertions, 7 deletions

diff --git a/disk/part.c b/disk/part.c
index b6bae1794..457502bed 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -229,19 +229,19 @@ void dev_print (block_dev_desc_t *dev_desc)
     defined(CONFIG_AMIGA_PARTITION) || \
     defined(CONFIG_EFI_PARTITION)
 
-void init_part (block_dev_desc_t * dev_desc)
+int init_part (block_dev_desc_t * dev_desc)
 {
 #ifdef CONFIG_ISO_PARTITION
 	if (test_part_iso(dev_desc) == 0) {
 		dev_desc->part_type = PART_TYPE_ISO;
-		return;
+		return 0;
 	}
 #endif
 
 #ifdef CONFIG_MAC_PARTITION
 	if (test_part_mac(dev_desc) == 0) {
 		dev_desc->part_type = PART_TYPE_MAC;
-		return;
+		return 0;
 	}
 #endif
 
@@ -249,23 +249,24 @@ void init_part (block_dev_desc_t * dev_desc)
 #ifdef CONFIG_EFI_PARTITION
 	if (test_part_efi(dev_desc) == 0) {
 		dev_desc->part_type = PART_TYPE_EFI;
-		return;
+		return 0;
 	}
 #endif
 
 #ifdef CONFIG_DOS_PARTITION
 	if (test_part_dos(dev_desc) == 0) {
 		dev_desc->part_type = PART_TYPE_DOS;
-		return;
+		return 0;
 	}
 #endif
 
 #ifdef CONFIG_AMIGA_PARTITION
 	if (test_part_amiga(dev_desc) == 0) {
 	    dev_desc->part_type = PART_TYPE_AMIGA;
-	    return;
+	    return 0;
 	}
 #endif
+	return -1;
 }
 
 
@@ -346,6 +347,12 @@ static void print_part_header (const char *type, block_dev_desc_t * dev_desc)
 	case IF_TYPE_DOC:
 		puts ("DOC");
 		break;
+	case IF_TYPE_MMC:
+		puts ("MMC");
+		break;
+	case IF_TYPE_SD:
+		puts ("SD");
+		break;
 	default:
 		puts ("UNKNOWN");
 		break;
@@ -407,4 +414,19 @@ void print_part (block_dev_desc_t * dev_desc)
 # error nor CONFIG_EFI_PARTITION configured!
 #endif
 
+#else
+/* Stub routines to allows code build */
+int init_part (block_dev_desc_t * dev_desc)
+{
+	return -1;
+}
+int get_partition_info (block_dev_desc_t *dev_desc, int part
+					, disk_partition_t *info)
+{
+	return -1;
+}
+void print_part (block_dev_desc_t * dev_desc)
+{
+	return;
+}
 #endif
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 887b75ec8..83854942a 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -78,7 +78,9 @@ static int test_block_type(unsigned char *buffer)
 		return (-1);
 	} /* no DOS Signature at all */
 	if(strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],"FAT",3)==0)
-		return DOS_PBR; /* is PBR */
+		return DOS_PBR; /* is PBR, FAT16 */
+	if(strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET2],"FAT",3)==0)
+		return DOS_PBR; /* is PBR, FAT32 */
 	return DOS_MBR;	    /* Is MBR */
 }
 
@@ -195,6 +197,11 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part
 			info->blksz = 512;
 			info->start = ext_part_sector + le32_to_int (pt->start4);
 			info->size  = le32_to_int (pt->size4);
+			/* in case bad device formating... */
+			if(   (info->start > dev_desc->lba)
+			   || (info->size > (dev_desc->lba*dev_desc->blksz))) {
+				return -1;
+			}
 			switch(dev_desc->if_type) {
 				case IF_TYPE_IDE:
 				case IF_TYPE_SATA:
diff --git a/disk/part_dos.h b/disk/part_dos.h
index ac93f20b3..0108d2319 100644
--- a/disk/part_dos.h
+++ b/disk/part_dos.h
@@ -35,6 +35,7 @@
 #define DOS_PART_TBL_OFFSET	0x1be
 #define DOS_PART_MAGIC_OFFSET	0x1fe
 #define DOS_PBR_FSTYPE_OFFSET	0x36
+#define DOS_PBR_FSTYPE_OFFSET2	0x52
 #define DOS_PBR_MEDIA_TYPE_OFFSET	0x15
 #define DOS_MBR	0
 #define DOS_PBR	1