fs/fatfs: Apply changes required for version 0.14b

The commit applies changes that are required by update of ELM Chan's
FAT FS driver update to version 0.14b.

Signed-off-by: Dominik Ermel <[email protected]>

Author: de-nordic

subsys/fs/Kconfig.fatfs

@@ -99,11 +99,9 @@ endif # FS_FATFS_LFN
 
 config FS_FATFS_CODEPAGE
 	int "FatFS code page (character set)"
-	default 437 if FS_FATFS_LFN
-	default 1
+	default 437
 	help
 	  Valid code page values:
-	  1   - ASCII (No extended character. Non-LFN cfg. only)
 	  437 - U.S.
 	  720 - Arabic
 	  737 - Greek

subsys/fs/fat_fs.c

@@ -383,17 +383,20 @@ static int fatfs_statvfs(struct fs_mount_t *mountp,
 	int res = -ENOTSUP;
 #if !defined(CONFIG_FS_FATFS_READ_ONLY)
 	FATFS *fs;
+	DWORD f_bfree = 0;
 
-	res = f_getfree(&mountp->mnt_point[1], &stat->f_bfree, &fs);
+	res = f_getfree(&mountp->mnt_point[1], &f_bfree, &fs);
 	if (res != FR_OK) {
 		return -EIO;
 	}
 
+	stat->f_bfree = f_bfree;
+
 	/*
-	 * _MIN_SS holds the sector size. It is one of the configuration
+	 * FF_MIN_SS holds the sector size. It is one of the configuration
 	 * constants used by the FS module
 	 */
-	stat->f_bsize = _MIN_SS;
+	stat->f_bsize = FF_MIN_SS;
 	stat->f_frsize = fs->csize * stat->f_bsize;
 	stat->f_blocks = (fs->n_fatent - 2);
 
@@ -416,10 +419,16 @@ static int fatfs_mount(struct fs_mount_t *mountp)
 	/* If no file system found then create one */
 	if (res == FR_NO_FILESYSTEM &&
 	    (mountp->flags & FS_MOUNT_FLAG_NO_FORMAT) == 0) {
-		uint8_t work[_MAX_SS];
-
-		res = f_mkfs(&mountp->mnt_point[1],
-				(FM_FAT | FM_SFD), 0, work, sizeof(work));
+		uint8_t work[FF_MAX_SS];
+		MKFS_PARM mkfs_opt = {
+			.fmt = FM_FAT | FM_SFD,	/* Any suitable FAT */
+			.n_fat = 1,		/* One FAT fs table */
+			.align = 0,		/* Get sector size via diskio query */
+			.n_root = 512,		/* Max 512 root directory entries */
+			.au_size = 0		/* Auto calculate cluster size */
+		};
+
+		res = f_mkfs(&mountp->mnt_point[1], &mkfs_opt, work, sizeof(work));
 		if (res == FR_OK) {
 			res = f_mount((FATFS *)mountp->fs_data,
 					&mountp->mnt_point[1], 1);
@@ -435,7 +444,7 @@ static int fatfs_unmount(struct fs_mount_t *mountp)
 {
 	FRESULT res;
 
-	res = f_mount(NULL, &mountp->mnt_point[1], 1);
+	res = f_mount(NULL, &mountp->mnt_point[1], 0);
 
 	return translate_error(res);
 }