Merge pull request #147 from romainreignier/update_tests

Update to latest ChibiOS API

7 files changed, 505 insertions, 232 deletions

diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h b/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h
index 53bd676..1843208 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/chconf.h
@@ -153,7 +153,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#define CH_CFG_USE_TM                       FALSE

+#define CH_CFG_USE_TM                       TRUE

 

 /**

  * @brief   Threads registry APIs.

diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/dma_storm_spi.c b/testhal/STM32/STM32F4xx/FSMC_NAND/dma_storm_spi.c
index 3c60484..7f02c11 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/dma_storm_spi.c
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/dma_storm_spi.c
@@ -49,6 +49,7 @@ static const uint8_t testbuf_flash[SPI_BUF_SIZE];
  *
  */
 static const SPIConfig spicfg = {
+    false,
     spi_end_cb,
     GPIOA,
     GPIOA_SPI1_NSS,
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/chconf.h b/testhal/STM32/STM32F4xx/FSMC_SDRAM/chconf.h
index 53bd676..1843208 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/chconf.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/chconf.h
@@ -153,7 +153,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#define CH_CFG_USE_TM                       FALSE

+#define CH_CFG_USE_TM                       TRUE

 

 /**

  * @brief   Threads registry APIs.

diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/chconf.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/chconf.h
index 53bd676..1843208 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/chconf.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/chconf.h
@@ -153,7 +153,7 @@
  *

  * @note    The default is @p TRUE.

  */

-#define CH_CFG_USE_TM                       FALSE

+#define CH_CFG_USE_TM                       TRUE

 

 /**

  * @brief   Threads registry APIs.

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
index e5506fa..a29150e 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
@@ -1,228 +1,228 @@
-##############################################################################
-# Build global options
-# NOTE: Can be overridden externally.
-#
-
-# Compiler options here.
-ifeq ($(USE_OPT),)
-  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
-endif
-
-# C specific options here (added to USE_OPT).
-ifeq ($(USE_COPT),)
-  USE_COPT = 
-endif
-
-# C++ specific options here (added to USE_OPT).
-ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -fno-rtti
-endif
-
-# Enable this if you want the linker to remove unused code and data
-ifeq ($(USE_LINK_GC),)
-  USE_LINK_GC = yes
-endif
-
-# Linker extra options here.
-ifeq ($(USE_LDOPT),)
-  USE_LDOPT = 
-endif
-
-# Enable this if you want link time optimizations (LTO)
-ifeq ($(USE_LTO),)
-  USE_LTO = yes
-endif
-
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
-# Enable this if you want to see the full log while compiling.
-ifeq ($(USE_VERBOSE_COMPILE),)
-  USE_VERBOSE_COMPILE = no
-endif
-
-# If enabled, this option makes the build process faster by not compiling
-# modules not used in the current configuration.
-ifeq ($(USE_SMART_BUILD),)
-  USE_SMART_BUILD = yes
-endif
-
-#
-# Build global options
-##############################################################################
-
-##############################################################################
-# Architecture or project specific options
-#
-
-# Stack size to be allocated to the Cortex-M process stack. This stack is
-# the stack used by the main() thread.
-ifeq ($(USE_PROCESS_STACKSIZE),)
-  USE_PROCESS_STACKSIZE = 0x400
-endif
-
-# Stack size to the allocated to the Cortex-M main/exceptions stack. This
-# stack is used for processing interrupts and exceptions.
-ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
-  USE_EXCEPTIONS_STACKSIZE = 0x400
-endif
-
-# Enables the use of FPU (no, softfp, hard).
-ifeq ($(USE_FPU),)
-  USE_FPU = no
-endif
-
-#
-# Architecture or project specific options
-##############################################################################
-
-##############################################################################
-# Project, sources and paths
-#
-
-# Define project name here
-PROJECT = ch
-
-# Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
-CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
-# Startup files.
-include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
-# HAL-OSAL files (optional).
-include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
-include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk
-include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/osal/rt/osal.mk
-# RTOS files (optional).
-include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
-# Other files (optional).
-include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
-include $(CHIBIOS)/os/hal/lib/streams/streams.mk
-include $(CHIBIOS)/os/various/shell/shell.mk
-include $(CHIBIOS_CONTRIB)/os/various/fatfs_bindings/fatfs.mk
-
-# Define linker script file here
-LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
-
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
-       $(TESTSRC)  \
-       $(FATFSSRC) \
-       $(STREAMSSRC) \
-       $(SHELLSRC) \
-       main.c usbh_custom_class_example.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CPPSRC =
-
-# C sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(STREAMSINC) $(SHELLINC) $(FATFSINC) \
-         $(CHIBIOS_CONTRIB)/os/various
-
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m4
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-AR   = $(TRGT)ar
-OD   = $(TRGT)objdump
-SZ   = $(TRGT)size
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
-CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
-
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra -Wundef
-
-#
-# Compiler settings
-##############################################################################
-
-##############################################################################
-# Start of user section
-#
-
-# List all user C define here, like -D_DEBUG=1
-UDEFS =
-
-# Define ASM defines here
-UADEFS =
-
-# List all user directories here
-UINCDIR =
-
-# List the user directory to look for the libraries here
-ULIBDIR =
-
-# List all user libraries here
-ULIBS =
-
-#
-# End of user defines
-##############################################################################
-
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
-include $(RULESPATH)/rules.mk
+##############################################################################

+# Build global options

+# NOTE: Can be overridden externally.

+#

+

+# Compiler options here.

+ifeq ($(USE_OPT),)

+  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16

+endif

+

+# C specific options here (added to USE_OPT).

+ifeq ($(USE_COPT),)

+  USE_COPT = 

+endif

+

+# C++ specific options here (added to USE_OPT).

+ifeq ($(USE_CPPOPT),)

+  USE_CPPOPT = -fno-rtti

+endif

+

+# Enable this if you want the linker to remove unused code and data

+ifeq ($(USE_LINK_GC),)

+  USE_LINK_GC = yes

+endif

+

+# Linker extra options here.

+ifeq ($(USE_LDOPT),)

+  USE_LDOPT = 

+endif

+

+# Enable this if you want link time optimizations (LTO)

+ifeq ($(USE_LTO),)

+  USE_LTO = yes

+endif

+

+# If enabled, this option allows to compile the application in THUMB mode.

+ifeq ($(USE_THUMB),)

+  USE_THUMB = yes

+endif

+

+# Enable this if you want to see the full log while compiling.

+ifeq ($(USE_VERBOSE_COMPILE),)

+  USE_VERBOSE_COMPILE = no

+endif

+

+# If enabled, this option makes the build process faster by not compiling

+# modules not used in the current configuration.

+ifeq ($(USE_SMART_BUILD),)

+  USE_SMART_BUILD = yes

+endif

+

+#

+# Build global options

+##############################################################################

+

+##############################################################################

+# Architecture or project specific options

+#

+

+# Stack size to be allocated to the Cortex-M process stack. This stack is

+# the stack used by the main() thread.

+ifeq ($(USE_PROCESS_STACKSIZE),)

+  USE_PROCESS_STACKSIZE = 0x400

+endif

+

+# Stack size to the allocated to the Cortex-M main/exceptions stack. This

+# stack is used for processing interrupts and exceptions.

+ifeq ($(USE_EXCEPTIONS_STACKSIZE),)

+  USE_EXCEPTIONS_STACKSIZE = 0x400

+endif

+

+# Enables the use of FPU (no, softfp, hard).

+ifeq ($(USE_FPU),)

+  USE_FPU = no

+endif

+

+#

+# Architecture or project specific options

+##############################################################################

+

+##############################################################################

+# Project, sources and paths

+#

+

+# Define project name here

+PROJECT = ch

+

+# Imported source files and paths

+CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

+# Startup files.

+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

+# HAL-OSAL files (optional).

+include $(CHIBIOS_CONTRIB)/os/hal/hal.mk

+include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk

+include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

+include $(CHIBIOS)/os/hal/osal/rt/osal.mk

+# RTOS files (optional).

+include $(CHIBIOS)/os/rt/rt.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk

+# Other files (optional).

+include $(CHIBIOS)/test/lib/test.mk

+include $(CHIBIOS)/test/rt/rt_test.mk

+include $(CHIBIOS)/test/oslib/oslib_test.mk

+include $(CHIBIOS)/os/hal/lib/streams/streams.mk

+include $(CHIBIOS)/os/various/shell/shell.mk

+include $(CHIBIOS_CONTRIB)/os/various/fatfs_bindings/fatfs.mk

+

+# Define linker script file here

+LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld

+

+# C sources that can be compiled in ARM or THUMB mode depending on the global

+# setting.

+CSRC = $(STARTUPSRC) \

+       $(KERNSRC) \

+       $(PORTSRC) \

+       $(OSALSRC) \

+       $(HALSRC) \

+       $(PLATFORMSRC) \

+       $(BOARDSRC) \

+       $(TESTSRC)  \

+       $(FATFSSRC) \

+       $(STREAMSSRC) \

+       $(SHELLSRC) \

+       main.c usbh_custom_class_example.c

+

+# C++ sources that can be compiled in ARM or THUMB mode depending on the global

+# setting.

+CPPSRC =

+

+# C sources to be compiled in ARM mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+ACSRC =

+

+# C++ sources to be compiled in ARM mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+ACPPSRC =

+

+# C sources to be compiled in THUMB mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+TCSRC =

+

+# C sources to be compiled in THUMB mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+TCPPSRC =

+

+# List ASM source files here

+ASMSRC =

+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

+

+INCDIR = $(CHIBIOS)/os/license \

+         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \

+         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

+         $(STREAMSINC) $(SHELLINC) $(FATFSINC) \

+         $(CHIBIOS_CONTRIB)/os/various

+

+#

+# Project, sources and paths

+##############################################################################

+

+##############################################################################

+# Compiler settings

+#

+

+MCU  = cortex-m4

+

+#TRGT = arm-elf-

+TRGT = arm-none-eabi-

+CC   = $(TRGT)gcc

+CPPC = $(TRGT)g++

+# Enable loading with g++ only if you need C++ runtime support.

+# NOTE: You can use C++ even without C++ support if you are careful. C++

+#       runtime support makes code size explode.

+LD   = $(TRGT)gcc

+#LD   = $(TRGT)g++

+CP   = $(TRGT)objcopy

+AS   = $(TRGT)gcc -x assembler-with-cpp

+AR   = $(TRGT)ar

+OD   = $(TRGT)objdump

+SZ   = $(TRGT)size

+HEX  = $(CP) -O ihex

+BIN  = $(CP) -O binary

+

+# ARM-specific options here

+AOPT =

+

+# THUMB-specific options here

+TOPT = -mthumb -DTHUMB

+

+# Define C warning options here

+CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes

+

+# Define C++ warning options here

+CPPWARN = -Wall -Wextra -Wundef

+

+#

+# Compiler settings

+##############################################################################

+

+##############################################################################

+# Start of user section

+#

+

+# List all user C define here, like -D_DEBUG=1

+UDEFS =

+

+# Define ASM defines here

+UADEFS =

+

+# List all user directories here

+UINCDIR =

+

+# List the user directory to look for the libraries here

+ULIBDIR =

+

+# List all user libraries here

+ULIBS =

+

+#

+# End of user defines

+##############################################################################

+

+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC

+include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h b/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
new file mode 100644
index 0000000..944ffde
--- /dev/null
+++ b/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
@@ -0,0 +1,272 @@
+/* CHIBIOS FIX */

+#include "ch.h"

+

+/*---------------------------------------------------------------------------/

+/  FatFs - Configuration file

+/---------------------------------------------------------------------------*/

+

+#define FFCONF_DEF 87030	/* Revision ID */

+

+/*---------------------------------------------------------------------------/

+/ Function Configurations

+/---------------------------------------------------------------------------*/

+

+#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 FF_FS_MINIMIZE	0

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

+/

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

+/   3: f_lseek() function is removed in addition to 2. */

+

+

+#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 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 FF_USE_MKFS		0

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

+

+

+#define FF_USE_FASTSEEK	0

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

+

+

+#define FF_USE_EXPAND	0

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

+

+

+#define FF_USE_CHMOD	0

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

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

+

+

+#define FF_USE_LABEL	0

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

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

+

+

+#define FF_USE_FORWARD	0

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

+

+

+/*---------------------------------------------------------------------------/

+/ Locale and Namespace Configurations

+/---------------------------------------------------------------------------*/

+

+#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.

+/

+/   437 - U.S.

+/   720 - Arabic

+/   737 - Greek

+/   771 - KBL

+/   775 - Baltic

+/   850 - Latin 1

+/   852 - Latin 2

+/   855 - Cyrillic

+/   857 - Turkish

+/   860 - Portuguese

+/   861 - Icelandic

+/   862 - Hebrew

+/   863 - Canadian French

+/   864 - Arabic

+/   865 - Nordic

+/   866 - Russian

+/   869 - Greek 2

+/   932 - Japanese (DBCS)

+/   936 - Simplified Chinese (DBCS)

+/   949 - Korean (DBCS)

+/   950 - Traditional Chinese (DBCS)

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

+*/

+

+

+#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.

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

+/

+/   0: ANSI/OEM

+/   1: UTF-16LE

+/   2: UTF-16BE

+/   3: UTF-8

+*/

+

+

+#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.

+/   2: f_getcwd() function is available in addition to 1.

+*/

+

+

+/*---------------------------------------------------------------------------/

+/ Drive/Volume Configurations

+/---------------------------------------------------------------------------*/

+

+#define FF_VOLUMES		1

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

+

+

+#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 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 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 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 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 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 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.

+/

+/  bit0=0: Use free cluster count in the FSINFO if available.

+/  bit0=1: Do not trust free cluster count in the FSINFO.

+/  bit1=0: Use last allocated cluster number in the FSINFO if available.

+/  bit1=1: Do not trust last allocated cluster number in the FSINFO.

+*/

+

+

+

+/*---------------------------------------------------------------------------/

+/ System Configurations

+/---------------------------------------------------------------------------*/

+

+#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 shrinked FF_MAX_SS bytes.

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

+

+

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

+/      should avoid illegal open, remove and rename to the open objects.

+/  >0: Enable file lock function. The value defines how many files/sub-directories

+/      can be opened simultaneously under file lock control. Note that the file

+/      lock control is independent of re-entrancy. */

+

+

+#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. 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 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/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h b/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
index e1a4136..55c8f4e 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
@@ -176,7 +176,7 @@
 #define HAL_USBH_PORT_DEBOUNCE_TIME                   200

 #define HAL_USBH_PORT_RESET_TIMEOUT                   500

 #define HAL_USBH_DEVICE_ADDRESS_STABILIZATION         20

-#define HAL_USBH_CONTROL_REQUEST_DEFAULT_TIMEOUT	  TIME_MS2I(1000)

+#define HAL_USBH_CONTROL_REQUEST_DEFAULT_TIMEOUT	    OSAL_MS2I(1000)

 

 /* MSD */

 #define HAL_USBH_USE_MSD                              TRUE