FatFS 0.13 integrated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10562 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 92 insertions, 90 deletions

diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/ffconf.h b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/ffconf.h
index ec2783035..944ffde25 100755
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/ffconf.h
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/ffconf.h
@@ -2,23 +2,23 @@
 #include "ch.h"

 

 /*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module configuration file

+/  FatFs - Configuration file

 /---------------------------------------------------------------------------*/

 

-#define _FFCONF 68020   /* Revision ID */

+#define FFCONF_DEF 87030	/* Revision ID */

 

 /*---------------------------------------------------------------------------/

 / Function Configurations

 /---------------------------------------------------------------------------*/

 

-#define _FS_READONLY    0

+#define FF_FS_READONLY	0

 /* This option switches read-only configuration. (0:Read/Write or 1:Read-only)

 /  Read-only configuration removes writing API functions, f_write(), f_sync(),

 /  f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()

 /  and optional writing functions as well. */

 

 

-#define _FS_MINIMIZE    0

+#define FF_FS_MINIMIZE	0

 /* This option defines minimization level to remove some basic API functions.

 /

 /   0: All basic functions are enabled.

@@ -28,43 +28,42 @@
 /   3: f_lseek() function is removed in addition to 2. */

 

 

-#define _USE_STRFUNC    0

-/* This option switches string functions, f_gets(), f_putc(), f_puts() and

-/  f_printf().

+#define FF_USE_STRFUNC	0

+/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().

 /

 /  0: Disable string functions.

 /  1: Enable without LF-CRLF conversion.

 /  2: Enable with LF-CRLF conversion. */

 

 

-#define _USE_FIND       0

+#define FF_USE_FIND		0

 /* This option switches filtered directory read functions, f_findfirst() and

 /  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */

 

 

-#define _USE_MKFS       0

+#define FF_USE_MKFS		0

 /* This option switches f_mkfs() function. (0:Disable or 1:Enable) */

 

 

-#define _USE_FASTSEEK   0

+#define FF_USE_FASTSEEK	0

 /* This option switches fast seek function. (0:Disable or 1:Enable) */

 

 

-#define _USE_EXPAND     0

+#define FF_USE_EXPAND	0

 /* This option switches f_expand function. (0:Disable or 1:Enable) */

 

 

-#define _USE_CHMOD      0

+#define FF_USE_CHMOD	0

 /* This option switches attribute manipulation functions, f_chmod() and f_utime().

-/  (0:Disable or 1:Enable) Also _FS_READONLY needs to be 0 to enable this option. */

+/  (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */

 

 

-#define _USE_LABEL      0

+#define FF_USE_LABEL	0

 /* This option switches volume label functions, f_getlabel() and f_setlabel().

 /  (0:Disable or 1:Enable) */

 

 

-#define _USE_FORWARD    0

+#define FF_USE_FORWARD	0

 /* This option switches f_forward() function. (0:Disable or 1:Enable) */

 

 

@@ -72,11 +71,10 @@
 / Locale and Namespace Configurations

 /---------------------------------------------------------------------------*/

 

-#define _CODE_PAGE      850

+#define FF_CODE_PAGE      850

 /* This option specifies the OEM code page to be used on the target system.

-/  Incorrect setting of the code page can cause a file open failure.

+/  Incorrect code page setting can cause a file open failure.

 /

-/   1   - ASCII (No extended character. Non-LFN cfg. only)

 /   437 - U.S.

 /   720 - Arabic

 /   737 - Greek

@@ -98,47 +96,50 @@
 /   936 - Simplified Chinese (DBCS)

 /   949 - Korean (DBCS)

 /   950 - Traditional Chinese (DBCS)

+/     0 - Include all code pages above and configured by f_setcp()

 */

 

 

-#define    _USE_LFN    3

-#define    _MAX_LFN    255

-/* The _USE_LFN switches the support of long file name (LFN).

+#define    FF_USE_LFN    3

+#define    FF_MAX_LFN    255

+/* The FF_USE_LFN switches the support for LFN (long file name).

 /

-/   0: Disable support of LFN. _MAX_LFN has no effect.

+/   0: Disable LFN. FF_MAX_LFN has no effect.

 /   1: Enable LFN with static working buffer on the BSS. Always NOT thread-safe.

 /   2: Enable LFN with dynamic working buffer on the STACK.

 /   3: Enable LFN with dynamic working buffer on the HEAP.

 /

 /  To enable the LFN, Unicode handling functions (option/unicode.c) must be added

-/  to the project. The working buffer occupies (_MAX_LFN + 1) * 2 bytes and

-/  additional 608 bytes at exFAT enabled. _MAX_LFN can be in range from 12 to 255.

+/  to the project. The working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and

+/  additional 608 bytes at exFAT enabled. FF_MAX_LFN can be in range from 12 to 255.

 /  It should be set 255 to support full featured LFN operations.

 /  When use stack for the working buffer, take care on stack overflow. When use heap

 /  memory for the working buffer, memory management functions, ff_memalloc() and

 /  ff_memfree(), must be added to the project. */

 

 

-#define _LFN_UNICODE    0

-/* This option switches character encoding on the API. (0:ANSI/OEM or 1:UTF-16)

-/  To use Unicode string for the path name, enable LFN and set _LFN_UNICODE = 1.

-/  This option also affects behavior of string I/O functions. */

+#define FF_LFN_UNICODE	0

+/* This option switches character encoding on the API, 0:ANSI/OEM or 1:UTF-16,

+/  when LFN is enabled. Also behavior of string I/O functions will be affected by

+/  this option. When LFN is not enabled, this option has no effect.

+*/

 

 

-#define _STRF_ENCODE    3

-/* When _LFN_UNICODE == 1, this option selects the character encoding ON THE FILE to

-/  be read/written via string I/O functions, f_gets(), f_putc(), f_puts and f_printf().

-/

-/  0: ANSI/OEM

-/  1: UTF-16LE

-/  2: UTF-16BE

-/  3: UTF-8

+#define FF_STRF_ENCODE	3

+/* When FF_LFN_UNICODE = 1 with LFN enabled, string I/O functions, f_gets(),

+/  f_putc(), f_puts and f_printf() convert the character encoding in it.

+/  This option selects assumption of character encoding ON THE FILE to be

+/  read/written via those functions.

 /

-/  This option has no effect when _LFN_UNICODE == 0. */

+/   0: ANSI/OEM

+/   1: UTF-16LE

+/   2: UTF-16BE

+/   3: UTF-8

+*/

 

 

-#define _FS_RPATH       0

-/* This option configures support of relative path.

+#define FF_FS_RPATH		0

+/* This option configures support for relative path.

 /

 /   0: Disable relative path and remove related functions.

 /   1: Enable relative path. f_chdir() and f_chdrive() are available.

@@ -150,45 +151,45 @@
 / Drive/Volume Configurations

 /---------------------------------------------------------------------------*/

 

-#define _VOLUMES        1

-/* Number of volumes (logical drives) to be used. */

+#define FF_VOLUMES		1

+/* Number of volumes (logical drives) to be used. (1-10) */

 

 

-#define _STR_VOLUME_ID  0

-#define _VOLUME_STRS    "RAM","NAND","CF","SD","SD2","USB","USB2","USB3"

-/* _STR_VOLUME_ID switches string support of volume ID.

-/  When _STR_VOLUME_ID is set to 1, also pre-defined strings can be used as drive

-/  number in the path name. _VOLUME_STRS defines the drive ID strings for each

-/  logical drives. Number of items must be equal to _VOLUMES. Valid characters for

+#define FF_STR_VOLUME_ID	0

+#define FF_VOLUME_STRS		"RAM","NAND","CF","SD","SD2","USB","USB2","USB3"

+/* FF_STR_VOLUME_ID switches string support for volume ID.

+/  When FF_STR_VOLUME_ID is set to 1, also pre-defined strings can be used as drive

+/  number in the path name. FF_VOLUME_STRS defines the drive ID strings for each

+/  logical drives. Number of items must be equal to FF_VOLUMES. Valid characters for

 /  the drive ID strings are: A-Z and 0-9. */

 

 

-#define _MULTI_PARTITION 0

-/* This option switches support of multi-partition on a physical drive.

+#define FF_MULTI_PARTITION	0

+/* This option switches support for multiple volumes on the physical drive.

 /  By default (0), each logical drive number is bound to the same physical drive

 /  number and only an FAT volume found on the physical drive will be mounted.

-/  When multi-partition is enabled (1), each logical drive number can be bound to

+/  When this function is enabled (1), each logical drive number can be bound to

 /  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()

 /  funciton will be available. */

 

 

-#define _MIN_SS         512

-#define _MAX_SS         512

-/* These options configure the range of sector size to be supported. (512, 1024,

-/  2048 or 4096) Always set both 512 for most systems, all type of memory cards and

+#define FF_MIN_SS		512

+#define FF_MAX_SS		512

+/* This set of options configures the range of sector size to be supported. (512,

+/  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and

 /  harddisk. But a larger value may be required for on-board flash memory and some

-/  type of optical media. When _MAX_SS is larger than _MIN_SS, FatFs is configured

-/  to variable sector size and GET_SECTOR_SIZE command must be implemented to the

-/  disk_ioctl() function. */

+/  type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured

+/  for variable sector size mode and disk_ioctl() function needs to implement

+/  GET_SECTOR_SIZE command. */

 

 

-#define _USE_TRIM       0

-/* This option switches support of ATA-TRIM. (0:Disable or 1:Enable)

+#define FF_USE_TRIM		0

+/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)

 /  To enable Trim function, also CTRL_TRIM command should be implemented to the

 /  disk_ioctl() function. */

 

 

-#define _FS_NOFSINFO    0

+#define FF_FS_NOFSINFO	0

 /* If you need to know correct free space on the FAT32 volume, set bit 0 of this

 /  option, and f_getfree() function at first time after volume mount will force

 /  a full FAT scan. Bit 1 controls the use of last allocated cluster number.

@@ -205,36 +206,36 @@
 / System Configurations

 /---------------------------------------------------------------------------*/

 

-#define _FS_TINY        0

+#define FF_FS_TINY		0

 /* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)

-/  At the tiny configuration, size of file object (FIL) is reduced _MAX_SS bytes.

+/  At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.

 /  Instead of private sector buffer eliminated from the file object, common sector

-/  buffer in the file system object (FATFS) is used for the file data transfer. */

+/  buffer in the filesystem object (FATFS) is used for the file data transfer. */

 

 

-#define _FS_EXFAT       1

-/* This option switches support of exFAT file system. (0:Disable or 1:Enable)

-/  When enable exFAT, also LFN needs to be enabled. (_USE_LFN >= 1)

-/  Note that enabling exFAT discards C89 compatibility. */

+#define FF_FS_EXFAT       1

+/* This option switches support for exFAT filesystem. (0:Disable or 1:Enable)

+/  When enable exFAT, also LFN needs to be enabled.

+/  Note that enabling exFAT discards ANSI C (C89) compatibility. */

 

 

-#define _FS_NORTC       0

-#define _NORTC_MON      1

-#define _NORTC_MDAY     1

-#define _NORTC_YEAR     2016

-/* The option _FS_NORTC switches timestamp functiton. If the system does not have

-/  any RTC function or valid timestamp is not needed, set _FS_NORTC = 1 to disable

+#define FF_FS_NORTC       1

+#define FF_NORTC_MON	5

+#define FF_NORTC_MDAY	1

+#define FF_NORTC_YEAR	2017

+/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have

+/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable

 /  the timestamp function. All objects modified by FatFs will have a fixed timestamp

-/  defined by _NORTC_MON, _NORTC_MDAY and _NORTC_YEAR in local time.

-/  To enable timestamp function (_FS_NORTC = 0), get_fattime() function need to be

-/  added to the project to get current time form real-time clock. _NORTC_MON,

-/  _NORTC_MDAY and _NORTC_YEAR have no effect. 

-/  These options have no effect at read-only configuration (_FS_READONLY = 1). */

+/  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.

+/  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be

+/  added to the project to read current time form real-time clock. FF_NORTC_MON,

+/  FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.

+/  These options have no effect at read-only configuration (FF_FS_READONLY = 1). */

 

 

-#define    _FS_LOCK     0

-/* The option _FS_LOCK switches file lock function to control duplicated file open

-/  and illegal operation to open objects. This option must be 0 when _FS_READONLY

+#define FF_FS_LOCK		0

+/* The option FF_FS_LOCK switches file lock function to control duplicated file open

+/  and illegal operation to open objects. This option must be 0 when FF_FS_READONLY

 /  is 1.

 /

 /  0:  Disable file lock function. To avoid volume corruption, application program

@@ -244,27 +245,28 @@
 /      lock control is independent of re-entrancy. */

 

 

-#define _FS_REENTRANT   0

-#define _FS_TIMEOUT     MS2ST(1000)

-#define _SYNC_t         semaphore_t*

-/* The option _FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs

+#define FF_FS_REENTRANT   0

+#define FF_FS_TIMEOUT     MS2ST(1000)

+#define FF_SYNC_t         semaphore_t*

+/* 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()

 /  and f_fdisk() function, are always not re-entrant. Only file/directory access

 /  to the same volume is under control of this function.

 /

-/   0: Disable re-entrancy. _FS_TIMEOUT and _SYNC_t have no effect.

+/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.

 /   1: Enable re-entrancy. Also user provided synchronization handlers,

 /      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()

 /      function, must be added to the project. Samples are available in

 /      option/syscall.c.

 /

-/  The _FS_TIMEOUT defines timeout period in unit of time tick.

-/  The _SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,

-/  SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be

+/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.

+/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,

+/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be

 /  included somewhere in the scope of ff.h. */

 

 /* #include <windows.h>	// O/S definitions  */

 

 

+

 /*--- End of configuration options ---*/

diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
index 2d09456d6..5e8d388c7 100755
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c
@@ -131,7 +131,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
   if (res == FR_OK) {

     i = strlen(path);

     while (((res = f_readdir(&dir, &fno)) == FR_OK) && fno.fname[0]) {

-      if (_FS_RPATH && fno.fname[0] == '.')

+      if (FF_FS_RPATH && fno.fname[0] == '.')

         continue;

       fn = fno.fname;

       if (fno.fattrib & AM_DIR) {