[fatfs] Move all the modifications made on original FatFs code to a separate file

- The propose is to make maintenance easier
- The file is "dfs_patch_content.h"
- "ff.c" and "ff.h" now have additional 1-line code comparing to original
- All changes in "ffconf.h" with comment
- "diskio.c" is removed

Author: onelife

library.properties

@@ -1,5 +1,5 @@
 name=RT-Thread
-version=0.3.1
+version=0.4.0
 author=Bernard Xiong <[email protected]>, onelife <[email protected]>
 maintainer=onelife <[email protected]>
 sentence=Real Time Operating System porting for Arduino SAM and SAMD boards

src/components/dfs/filesystems/elmfat/dfs_patch_content.h

@@ -0,0 +1,40 @@
+/***************************************************************************//**
+ * @file    dfs_patch.h
+ * @brief   Arduino RT-Thread library ChaN's FatFs patch header
+ * @note    This file includes modifications made on original FatFs code to make
+ *            maintenance easier
+ * @author  onelife <onelife.real[at]gmail.com>
+ ******************************************************************************/
+#include "include/rtthread.h"
+#include "dfs_patch_header.h"
+
+FRESULT f_seekdir(
+    DIR *dj,        /* Pointer to the open directory object */
+    int offset      /* the seek offset */
+) {
+    int i = 0;
+
+    if (dir_sdi(dj, 0) != FR_OK || offset < 0)
+        return FR_INT_ERR;
+
+    while (i < offset) {
+        if (dir_read(dj, 0) != FR_OK || dir_next(dj, 0) != FR_OK)
+            return FR_INT_ERR;
+        i++;
+    }
+    return FR_OK;
+}
+
+
+#if FF_VOLUMES > 1
+
+int elm_get_vol(FATFS *fat) {
+    unsigned int vol;
+
+    for (vol = 0; vol < FF_VOLUMES; vol ++)
+        if (FatFs[vol] == fat) return vol;
+
+    return -1;
+}
+
+#endif  /* FF_VOLUMES > 1 */

src/components/dfs/filesystems/elmfat/dfs_patch_header.h

@@ -0,0 +1,11 @@
+/***************************************************************************//**
+ * @file    dfs_patch.h
+ * @brief   Arduino RT-Thread library ChaN's FatFs patch header
+ * @author  onelife <onelife.real[at]gmail.com>
+ ******************************************************************************/
+#ifndef __DFS_PATCH_H__
+#define __DFS_PATCH_H__
+
+FRESULT f_seekdir(DIR *dj, int offset);                             /* Seek in directory */
+
+#endif /* __DFS_PATCH_H__ */

src/components/dfs/filesystems/elmfat/ff.c

@@ -4537,24 +4537,7 @@ FRESULT f_readdir (
 	LEAVE_FF(fs, res);
 }
 
-FRESULT f_seekdir(
-	DIR *dj,		/* Pointer to the open directory object */
-	int offset		/* the seek offset */
-)
-{
-	int i = 0;
-
-	if (dir_sdi(dj, 0) != FR_OK || offset < 0)
-		return FR_INT_ERR;
 
-	while(i < offset)
-	{
-		if(dir_read(dj, 0) != FR_OK || dir_next(dj, 0) != FR_OK)
-			return FR_INT_ERR;
-		i++;
-	} 
-	return FR_OK;
-}
 
 #if FF_USE_FIND
 /*-----------------------------------------------------------------------*/
@@ -6571,18 +6554,4 @@ FRESULT f_setcp (
 }
 #endif	/* FF_CODE_PAGE == 0 */
 
-#include "include/rtthread.h"
-#if FF_VOLUMES > 1
-int elm_get_vol(FATFS *fat)
-{
-	int vol;
-
-	for (vol = 0; vol < FF_VOLUMES; vol ++)
-	{
-		if (FatFs[vol] == fat) return vol;
-	}
-
-	return -1;
-}
-#endif
-
+#include "dfs_patch_content.h"

src/components/dfs/filesystems/elmfat/ff.h

@@ -26,7 +26,6 @@
 extern "C" {
 #endif
 
-//#include "include/rtthread.h"
 #include "ffconf.h"		/* FatFs configuration options */
 
 #if FF_DEFINED != FFCONF_DEF
@@ -291,7 +290,6 @@ FRESULT f_sync (FIL* fp);											/* Flush cached data of the writing file */
 FRESULT f_opendir (DIR* dp, const TCHAR* path);						/* Open a directory */
 FRESULT f_closedir (DIR* dp);										/* Close an open directory */
 FRESULT f_readdir (DIR* dp, FILINFO* fno);							/* Read a directory item */
-FRESULT f_seekdir(DIR *dj, int offset);								/* Seek in directory */
 FRESULT f_findfirst (DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern);	/* Find first file */
 FRESULT f_findnext (DIR* dp, FILINFO* fno);							/* Find next file */
 FRESULT f_mkdir (const TCHAR* path);								/* Create a sub directory */
@@ -400,6 +398,8 @@ int ff_del_syncobj (FF_SYNC_t sobj);	/* Delete a sync object */
 #define AM_ARC	0x20	/* Archive */
 
 
+#include "dfs_patch_header.h"
+
 #ifdef __cplusplus
 }
 #endif

src/components/dfs/filesystems/elmfat/ffconf.h

@@ -38,11 +38,11 @@
 /  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
 
 
-#define FF_USE_MKFS		1
+#define FF_USE_MKFS		1  /* RTT config */
 /* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
 
 
-#define FF_USE_FASTSEEK	1
+#define FF_USE_FASTSEEK	1   /* RTT config */
 /* This option switches fast seek function. (0:Disable or 1:Enable) */
 
 
@@ -68,7 +68,7 @@
 / Locale and Namespace Configurations
 /---------------------------------------------------------------------------*/
 
-#ifdef RT_DFS_ELM_CODE_PAGE
+#ifdef RT_DFS_ELM_CODE_PAGE  /* RTT config */
 #define FF_CODE_PAGE	RT_DFS_ELM_CODE_PAGE
 #else
 #define FF_CODE_PAGE	932
@@ -101,7 +101,7 @@
 */
 
 
-#if RT_DFS_ELM_USE_LFN
+#if RT_DFS_ELM_USE_LFN  /* RTT config */
 #define FF_USE_LFN		RT_DFS_ELM_USE_LFN
 #define FF_MAX_LFN		RT_DFS_ELM_MAX_LFN
 #else
@@ -126,7 +126,7 @@
 /  ff_memfree() in ffsystem.c, need to be added to the project. */
 
 
-#ifdef RT_DFS_ELM_LFN_UNICODE
+#ifdef RT_DFS_ELM_LFN_UNICODE  /* RTT config */
 #define FF_LFN_UNICODE	1
 #else
 #define FF_LFN_UNICODE	0
@@ -176,7 +176,7 @@
 / Drive/Volume Configurations
 /---------------------------------------------------------------------------*/
 
-#ifdef RT_DFS_ELM_DRIVES
+#ifdef RT_DFS_ELM_DRIVES  /* RTT config */
 #define FF_VOLUMES		RT_DFS_ELM_DRIVES
 #else
 #define FF_VOLUMES		1
@@ -208,7 +208,7 @@
 
 
 #define FF_MIN_SS		512
-#ifdef RT_DFS_ELM_MAX_SECTOR_SIZE
+#ifdef RT_DFS_ELM_MAX_SECTOR_SIZE  /* RTT config */
 #define FF_MAX_SS		RT_DFS_ELM_MAX_SECTOR_SIZE
 #else
 #define FF_MAX_SS		512
@@ -250,7 +250,7 @@
 /  Instead of private sector buffer eliminated from the file object, common sector
 /  buffer in the filesystem object (FATFS) is used for the file data transfer. */
 
-#ifdef RT_DFS_ELM_USE_EXFAT
+#ifdef RT_DFS_ELM_USE_EXFAT  /* RTT config */
 #define FF_FS_EXFAT		1
 #else
 #define FF_FS_EXFAT		0
@@ -287,13 +287,13 @@
 
 
 /* #include <somertos.h>	// O/S definitions */
-#ifdef RT_DFS_ELM_REENTRANT
+#ifdef RT_DFS_ELM_REENTRANT  /* RTT config */
 #define FF_FS_REENTRANT	1
 #else
 #define FF_FS_REENTRANT	0
 #endif
 #define FF_FS_TIMEOUT	1000
-#define FF_SYNC_t		rt_mutex_t
+#define FF_SYNC_t		rt_mutex_t  /* RTT config */
 /* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
 /  module itself. Note that regardless of this option, file access to different
 /  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()