USBH: testhal: fix compile with FATFS 0.13

1 files changed, 35 insertions, 54 deletions

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h b/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
index c3530a5..944ffde 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
@@ -2,10 +2,10 @@
 #include "ch.h"

 

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

-/  FatFs Functional Configurations

+/  FatFs - Configuration file

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

 

-#define FFCONF_DEF	86604	/* Revision ID */

+#define FFCONF_DEF 87030	/* Revision ID */

 

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

 / Function Configurations

@@ -21,7 +21,7 @@
 #define FF_FS_MINIMIZE	0

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

 /

-/   0: Basic functions are fully enabled.

+/   0: All basic functions are enabled.

 /   1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_truncate() and f_rename()

 /      are removed.

 /   2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.

@@ -71,7 +71,7 @@
 / Locale and Namespace Configurations

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

 

-#define FF_CODE_PAGE	437

+#define FF_CODE_PAGE      850

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

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

 /

@@ -100,8 +100,8 @@
 */

 

 

-#define FF_USE_LFN		3

-#define FF_MAX_LFN		255

+#define    FF_USE_LFN    3

+#define    FF_MAX_LFN    255

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

 /

 /   0: Disable LFN. FF_MAX_LFN has no effect.

@@ -109,47 +109,32 @@
 /   2: Enable LFN with dynamic working buffer on the STACK.

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

 /

-/  To enable the LFN, ffunicode.c needs to be added to the project. The LFN function

-/  requiers certain internal working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and

-/  additional (FF_MAX_LFN + 44) / 15 * 32 bytes when exFAT is enabled.

-/  The FF_MAX_LFN defines size of the working buffer in UTF-16 code unit and it can

-/  be in range of 12 to 255. It is recommended to be set 255 to fully support LFN

-/  specification.

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

+/  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() in ffsystem.c, need to be added to the project. */

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

 

 

 #define FF_LFN_UNICODE	0

-/* This option switches the character encoding on the API when LFN is enabled.

-/

-/   0: ANSI/OEM in current CP (TCHAR = char)

-/   1: Unicode in UTF-16 (TCHAR = WCHAR)

-/   2: Unicode in UTF-8 (TCHAR = char)

-/   3: Unicode in UTF-32 (TCHAR = DWORD)

-/

-/  Also behavior of string I/O functions will be affected by this option.

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

-

-

-#define FF_LFN_BUF		255

-#define FF_SFN_BUF		12

-/* This set of options defines size of file name members in the FILINFO structure

-/  which is used to read out directory items. These values should be suffcient for

-/  the file names to read. The maximum possible length of the read file name depends

-/  on character encoding. When LFN is not enabled, these options have no effect. */

+/* 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 FF_STRF_ENCODE	3

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

+/* 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.

 /

-/   0: ANSI/OEM in current CP

-/   1: Unicode in UTF-16LE

-/   2: Unicode in UTF-16BE

-/   3: Unicode in UTF-8

+/   0: ANSI/OEM

+/   1: UTF-16LE

+/   2: UTF-16BE

+/   3: UTF-8

 */

 

 

@@ -172,16 +157,11 @@
 

 #define FF_STR_VOLUME_ID	0

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

-/* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.

-/  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive

-/  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each

-/  logical drives. Number of items must not be less than FF_VOLUMES. Valid

-/  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are

-/  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is

-/  not defined, a user defined volume string table needs to be defined as:

-/

-/  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...

-*/

+/* 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 FF_MULTI_PARTITION	0

@@ -233,19 +213,19 @@
 /  buffer in the filesystem object (FATFS) is used for the file data transfer. */

 

 

-#define FF_FS_EXFAT		1

+#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 FF_FS_NORTC		1

-#define FF_NORTC_MON	1

+#define FF_FS_NORTC       1

+#define FF_NORTC_MON	5

 #define FF_NORTC_MDAY	1

-#define FF_NORTC_YEAR	2018

+#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. Every object modified by FatFs will have a fixed timestamp

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

 /  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,

@@ -265,10 +245,9 @@
 /      lock control is independent of re-entrancy. */

 

 

-/* #include <somertos.h>	// O/S definitions */

-#define FF_FS_REENTRANT	0

-#define FF_FS_TIMEOUT	1000

-#define FF_SYNC_t		HANDLE

+#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()

@@ -286,6 +265,8 @@
 /  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 ---*/