Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib

9 files changed, 327 insertions, 74 deletions

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/.cproject b/testhal/STM32/STM32F4xx/USB_HOST/.cproject
index d733e39..8d56b51 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/.cproject
+++ b/testhal/STM32/STM32F4xx/USB_HOST/.cproject
@@ -14,7 +14,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration buildProperties="" description="" id="0.1003150841" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+				<configuration buildProperties="" description="" id="0.1003150841" name="Default" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.prefbase.cfg">
 					<folderInfo id="0.1003150841." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.748316353" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.748316353.81353447" name=""/>
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/.project b/testhal/STM32/STM32F4xx/USB_HOST/.project
index e2dd63e..8db459b 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/.project
+++ b/testhal/STM32/STM32F4xx/USB_HOST/.project
@@ -33,7 +33,7 @@
 		<link>
 			<name>ChibiOS-RT</name>
 			<type>2</type>
-			<locationURI>$%7BPARENT-5-PROJECT_LOC%7D/ChibiOS-RT</locationURI>
+			<locationURI>$%7BPARENT-5-PROJECT_LOC%7D/ChibiOS</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/.settings/org.eclipse.cdt.core.prefs b/testhal/STM32/STM32F4xx/USB_HOST/.settings/org.eclipse.cdt.core.prefs
new file mode 100644
index 0000000..8ae48ef
--- /dev/null
+++ b/testhal/STM32/STM32F4xx/USB_HOST/.settings/org.eclipse.cdt.core.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+environment/project/0.1003150841/PATH/delimiter=;
+environment/project/0.1003150841/PATH/operation=replace
+environment/project/0.1003150841/PATH/value=${PATH};D\:\\toolchains\\gcc-arm-none-eabi-8-2018-q4-major-win32\\bin;${PATH};D\:\\toolchains\\gcc-arm-none-eabi-4_9-2014q4-20141203-win32\\bin;D\:\\toolchains\\msys64\\usr\\bin
+environment/project/0.1003150841/append=true
+environment/project/0.1003150841/appendContributed=true
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
index 7bd8ea1..54c23ca 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

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

+CHIBIOS = ../../../../../ChibiOS

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

 

 # Licensing files.

@@ -97,7 +97,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m
 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

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

 # RTOS files (optional).

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

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

@@ -118,12 +118,11 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
 # setting.

 CSRC = $(ALLCSRC) \

        $(TESTSRC) \

-       $(FATFSSRC) \

        main.c usbh_custom_class_example.c

 

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

 # setting.

-CPPSRC =

+CPPSRC = $(ALLCPPSRC)

 

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

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

@@ -146,11 +145,10 @@ TCSRC =
 TCPPSRC =

 

 # List ASM source files here

-ASMSRC =

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

+ASMSRC = $(ALLASMSRC)

+ASMXSRC = $(ALLXASMSRC)

 

-INCDIR = $(ALLINC) $(TESTINC) $(FATFSINC) \

-         $(CHIBIOS_CONTRIB)/os/various

+INCDIR = $(ALLINC) $(TESTINC)

 

 #

 # Project, sources and paths

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/chconf.h b/testhal/STM32/STM32F4xx/USB_HOST/chconf.h
index 682ae51..17496b1 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/chconf.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/chconf.h
@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    templates/chconf.h

+ * @file    rt/templates/chconf.h

  * @brief   Configuration file template.

  * @details A copy of this file must be placed in each project directory, it

  *          contains the application specific kernel settings.

@@ -42,26 +42,34 @@
  * @brief   System time counter resolution.

  * @note    Allowed values are 16 or 32 bits.

  */

+#if !defined(CH_CFG_ST_RESOLUTION)

 #define CH_CFG_ST_RESOLUTION                32

+#endif

 

 /**

  * @brief   System tick frequency.

  * @details Frequency of the system timer that drives the system ticks. This

  *          setting also defines the system tick time unit.

  */

-#define CH_CFG_ST_FREQUENCY                 1000

+#if !defined(CH_CFG_ST_FREQUENCY)

+#define CH_CFG_ST_FREQUENCY                 10000

+#endif

 

 /**

  * @brief   Time intervals data size.

  * @note    Allowed values are 16, 32 or 64 bits.

  */

+#if !defined(CH_CFG_INTERVALS_SIZE)

 #define CH_CFG_INTERVALS_SIZE               32

+#endif

 

 /**

  * @brief   Time types data size.

  * @note    Allowed values are 16 or 32 bits.

  */

+#if !defined(CH_CFG_TIME_TYPES_SIZE)

 #define CH_CFG_TIME_TYPES_SIZE              32

+#endif

 

 /**

  * @brief   Time delta constant for the tick-less mode.

@@ -71,7 +79,9 @@
  *          The value one is not valid, timeouts are rounded up to

  *          this value.

  */

-#define CH_CFG_ST_TIMEDELTA                 0

+#if !defined(CH_CFG_ST_TIMEDELTA)

+#define CH_CFG_ST_TIMEDELTA                 2

+#endif

 

 /** @} */

 

@@ -94,7 +104,9 @@
  * @note    The round robin preemption is not supported in tickless mode and

  *          must be set to zero in that case.

  */

+#if !defined(CH_CFG_TIME_QUANTUM)

 #define CH_CFG_TIME_QUANTUM                 0

+#endif

 

 /**

  * @brief   Managed RAM size.

@@ -107,7 +119,9 @@
  *          provide the @p __heap_base__ and @p __heap_end__ symbols.

  * @note    Requires @p CH_CFG_USE_MEMCORE.

  */

+#if !defined(CH_CFG_MEMCORE_SIZE)

 #define CH_CFG_MEMCORE_SIZE                 0

+#endif

 

 /**

  * @brief   Idle thread automatic spawn suppression.

@@ -116,7 +130,9 @@
  *          function becomes the idle thread and must implement an

  *          infinite loop.

  */

+#if !defined(CH_CFG_NO_IDLE_THREAD)

 #define CH_CFG_NO_IDLE_THREAD               FALSE

+#endif

 

 /** @} */

 

@@ -135,7 +151,9 @@
  * @note    This is not related to the compiler optimization options.

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_OPTIMIZE_SPEED)

 #define CH_CFG_OPTIMIZE_SPEED               TRUE

+#endif

 

 /** @} */

 

@@ -153,7 +171,9 @@
  *

  * @note    The default is @p TRUE.

  */

-#define CH_CFG_USE_TM                       FALSE

+#if !defined(CH_CFG_USE_TM)

+#define CH_CFG_USE_TM                       TRUE

+#endif

 

 /**

  * @brief   Threads registry APIs.

@@ -161,7 +181,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_REGISTRY)

 #define CH_CFG_USE_REGISTRY                 TRUE

+#endif

 

 /**

  * @brief   Threads synchronization APIs.

@@ -170,7 +192,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_WAITEXIT)

 #define CH_CFG_USE_WAITEXIT                 TRUE

+#endif

 

 /**

  * @brief   Semaphores APIs.

@@ -178,7 +202,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_SEMAPHORES)

 #define CH_CFG_USE_SEMAPHORES               TRUE

+#endif

 

 /**

  * @brief   Semaphores queuing mode.

@@ -189,7 +215,9 @@
  *          requirements.

  * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)

 #define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE

+#endif

 

 /**

  * @brief   Mutexes APIs.

@@ -197,7 +225,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MUTEXES)

 #define CH_CFG_USE_MUTEXES                  TRUE

+#endif

 

 /**

  * @brief   Enables recursive behavior on mutexes.

@@ -207,7 +237,9 @@
  * @note    The default is @p FALSE.

  * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)

 #define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE

+#endif

 

 /**

  * @brief   Conditional Variables APIs.

@@ -217,7 +249,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_MUTEXES.

  */

+#if !defined(CH_CFG_USE_CONDVARS)

 #define CH_CFG_USE_CONDVARS                 TRUE

+#endif

 

 /**

  * @brief   Conditional Variables APIs with timeout.

@@ -227,7 +261,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_CONDVARS.

  */

+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)

 #define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE

+#endif

 

 /**

  * @brief   Events Flags APIs.

@@ -235,7 +271,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_EVENTS)

 #define CH_CFG_USE_EVENTS                   TRUE

+#endif

 

 /**

  * @brief   Events Flags APIs with timeout.

@@ -245,7 +283,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_EVENTS.

  */

+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)

 #define CH_CFG_USE_EVENTS_TIMEOUT           TRUE

+#endif

 

 /**

  * @brief   Synchronous Messages APIs.

@@ -254,7 +294,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MESSAGES)

 #define CH_CFG_USE_MESSAGES                 TRUE

+#endif

 

 /**

  * @brief   Synchronous Messages queuing mode.

@@ -265,7 +307,9 @@
  *          requirements.

  * @note    Requires @p CH_CFG_USE_MESSAGES.

  */

+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)

 #define CH_CFG_USE_MESSAGES_PRIORITY        FALSE

+#endif

 

 /**

  * @brief   Mailboxes APIs.

@@ -275,7 +319,9 @@
  * @note    The default is @p TRUE.

  * @note    Requires @p CH_CFG_USE_SEMAPHORES.

  */

+#if !defined(CH_CFG_USE_MAILBOXES)

 #define CH_CFG_USE_MAILBOXES                TRUE

+#endif

 

 /**

  * @brief   Core Memory Manager APIs.

@@ -284,7 +330,9 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MEMCORE)

 #define CH_CFG_USE_MEMCORE                  TRUE

+#endif

 

 /**

  * @brief   Heap Allocator APIs.

@@ -296,7 +344,9 @@
  *          @p CH_CFG_USE_SEMAPHORES.

  * @note    Mutexes are recommended.

  */

+#if !defined(CH_CFG_USE_HEAP)

 #define CH_CFG_USE_HEAP                     TRUE

+#endif

 

 /**

  * @brief   Memory Pools Allocator APIs.

@@ -305,16 +355,31 @@
  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_MEMPOOLS)

 #define CH_CFG_USE_MEMPOOLS                 TRUE

+#endif

 

 /**

- * @brief  Objects FIFOs APIs.

+ * @brief   Objects FIFOs APIs.

  * @details If enabled then the objects FIFOs APIs are included

  *          in the kernel.

  *

  * @note    The default is @p TRUE.

  */

+#if !defined(CH_CFG_USE_OBJ_FIFOS)

 #define CH_CFG_USE_OBJ_FIFOS                TRUE

+#endif

+

+/**

+ * @brief   Pipes APIs.

+ * @details If enabled then the pipes APIs are included

+ *          in the kernel.

+ *

+ * @note    The default is @p TRUE.

+ */

+#if !defined(CH_CFG_USE_PIPES)

+#define CH_CFG_USE_PIPES                    TRUE

+#endif

 

 /**

  * @brief   Dynamic Threads APIs.

@@ -325,7 +390,9 @@
  * @note    Requires @p CH_CFG_USE_WAITEXIT.

  * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.

  */

+#if !defined(CH_CFG_USE_DYNAMIC)

 #define CH_CFG_USE_DYNAMIC                  TRUE

+#endif

 

 /** @} */

 

@@ -343,39 +410,60 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_CFG_USE_FACTORY)

 #define CH_CFG_USE_FACTORY                  TRUE

+#endif

 

 /**

  * @brief   Maximum length for object names.

  * @details If the specified length is zero then the name is stored by

  *          pointer but this could have unintended side effects.

  */

+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)

 #define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8

+#endif

 

 /**

  * @brief   Enables the registry of generic objects.

  */

+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)

 #define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE

+#endif

 

 /**

  * @brief   Enables factory for generic buffers.

  */

+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)

 #define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE

+#endif

 

 /**

  * @brief   Enables factory for semaphores.

  */

+#if !defined(CH_CFG_FACTORY_SEMAPHORES)

 #define CH_CFG_FACTORY_SEMAPHORES           TRUE

+#endif

 

 /**

  * @brief   Enables factory for mailboxes.

  */

+#if !defined(CH_CFG_FACTORY_MAILBOXES)

 #define CH_CFG_FACTORY_MAILBOXES            TRUE

+#endif

 

 /**

  * @brief   Enables factory for objects FIFOs.

  */

+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)

 #define CH_CFG_FACTORY_OBJ_FIFOS            TRUE

+#endif

+

+/**

+ * @brief   Enables factory for Pipes.

+ */

+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)

+#define CH_CFG_FACTORY_PIPES                TRUE

+#endif

 

 /** @} */

 

@@ -391,7 +479,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_STATISTICS)

 #define CH_DBG_STATISTICS                   FALSE

+#endif

 

 /**

  * @brief   Debug option, system state check.

@@ -400,7 +490,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)

 #define CH_DBG_SYSTEM_STATE_CHECK           TRUE

+#endif

 

 /**

  * @brief   Debug option, parameters checks.

@@ -409,7 +501,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_ENABLE_CHECKS)

 #define CH_DBG_ENABLE_CHECKS                TRUE

+#endif

 

 /**

  * @brief   Debug option, consistency checks.

@@ -419,7 +513,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_ENABLE_ASSERTS)

 #define CH_DBG_ENABLE_ASSERTS               TRUE

+#endif

 

 /**

  * @brief   Debug option, trace buffer.

@@ -427,14 +523,18 @@
  *

  * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.

  */

+#if !defined(CH_DBG_TRACE_MASK)

 #define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED

+#endif

 

 /**

  * @brief   Trace buffer entries.

  * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is

  *          different from @p CH_DBG_TRACE_MASK_DISABLED.

  */

+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)

 #define CH_DBG_TRACE_BUFFER_SIZE            128

+#endif

 

 /**

  * @brief   Debug option, stack checks.

@@ -446,7 +546,9 @@
  * @note    The default failure mode is to halt the system with the global

  *          @p panic_msg variable set to @p NULL.

  */

+#if !defined(CH_DBG_ENABLE_STACK_CHECK)

 #define CH_DBG_ENABLE_STACK_CHECK           TRUE

+#endif

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -456,7 +558,9 @@
  *

  * @note    The default is @p FALSE.

  */

+#if !defined(CH_DBG_FILL_THREADS)

 #define CH_DBG_FILL_THREADS                 TRUE

+#endif

 

 /**

  * @brief   Debug option, threads profiling.

@@ -467,7 +571,9 @@
  * @note    This debug option is not currently compatible with the

  *          tickless mode.

  */

+#if !defined(CH_DBG_THREADS_PROFILING)

 #define CH_DBG_THREADS_PROFILING            FALSE

+#endif

 

 /** @} */

 

@@ -490,7 +596,7 @@
  * @details User initialization code added to the @p chSysInit() function

  *          just before interrupts are enabled globally.

  */

-#define CH_CFG_SYSTEM_INIT_HOOK(tp) {                                       \

+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \

   /* Add threads initialization code here.*/                                \

 }

 

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h b/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
index 944ffde..c3530a5 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 - Configuration file

+/  FatFs Functional Configurations

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

 

-#define FFCONF_DEF 87030	/* Revision ID */

+#define FFCONF_DEF	86604	/* 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: All basic functions are enabled.

+/   0: Basic functions are fully 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      850

+#define FF_CODE_PAGE	437

 /* 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,32 +109,47 @@
 /   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.

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

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

+/  ff_memfree() in ffsystem.c, need to 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.

-*/

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

 

 

 #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

-/   1: UTF-16LE

-/   2: UTF-16BE

-/   3: UTF-8

+/   0: ANSI/OEM in current CP

+/   1: Unicode in UTF-16LE

+/   2: Unicode in UTF-16BE

+/   3: Unicode in UTF-8

 */

 

 

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

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

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

+*/

 

 

 #define FF_MULTI_PARTITION	0

@@ -213,19 +233,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	5

+#define FF_FS_NORTC		1

+#define FF_NORTC_MON	1

 #define FF_NORTC_MDAY	1

-#define FF_NORTC_YEAR	2017

+#define FF_NORTC_YEAR	2018

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

+/  the timestamp function. Every object 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,

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

 

 

-#define FF_FS_REENTRANT   0

-#define FF_FS_TIMEOUT     MS2ST(1000)

-#define FF_SYNC_t         semaphore_t*

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

+#define FF_FS_REENTRANT	0

+#define FF_FS_TIMEOUT	1000

+#define FF_SYNC_t		HANDLE

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

@@ -265,8 +286,6 @@
 /  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.h b/testhal/STM32/STM32F4xx/USB_HOST/halconf.h
index 26f5eae..8b5d823 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/halconf.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/halconf.h
@@ -28,6 +28,9 @@
 #ifndef HALCONF_H
 #define HALCONF_H
 
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_1_
+
 #include "mcuconf.h"
 
 /**
@@ -66,10 +69,10 @@
 #endif
 
 /**
- * @brief   Enables the EXT subsystem.
+ * @brief   Enables the EFlash subsystem.
  */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 FALSE
+#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
+#define HAL_USE_EFL                         FALSE
 #endif
 
 /**
@@ -122,13 +125,6 @@
 #endif
 
 /**
- * @brief   Enables the QSPI subsystem.
- */
-#if !defined(HAL_USE_QSPI) || defined(__DOXYGEN__)
-#define HAL_USE_QSPI                FALSE
-#endif
-
-/**
  * @brief   Enables the RTC subsystem.
  */
 #if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
@@ -139,7 +135,7 @@
  * @brief   Enables the SDC subsystem.
  */
 #if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                 FALSE
+#define HAL_USE_SDC                 TRUE
 #endif
 
 /**
@@ -157,6 +153,13 @@
 #endif
 
 /**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
  * @brief   Enables the SPI subsystem.
  */
 #if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
@@ -164,6 +167,13 @@
 #endif
 
 /**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
  * @brief   Enables the UART subsystem.
  */
 #if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
@@ -184,6 +194,33 @@
 #define HAL_USE_WDG                 FALSE
 #endif
 
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
 /*===========================================================================*/
 /* ADC driver related settings.                                              */
 /*===========================================================================*/
@@ -215,6 +252,13 @@
 #define CAN_USE_SLEEP_MODE          TRUE
 #endif
 
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
 /*===========================================================================*/
 /* CRY driver related settings.                                              */
 /*===========================================================================*/
@@ -238,6 +282,26 @@
 #endif
 
 /*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
 /* I2C driver related settings.                                              */
 /*===========================================================================*/
 
@@ -253,7 +317,7 @@
 /*===========================================================================*/
 
 /**
- * @brief   Enables an event sources for incoming packets.
+ * @brief   Enables the zero-copy API.
  */
 #if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
 #define MAC_USE_ZERO_COPY           FALSE
@@ -313,6 +377,20 @@
 #define SDC_NICE_WAITING            TRUE
 #endif
 
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
 /*===========================================================================*/
 /* SERIAL driver related settings.                                           */
 /*===========================================================================*/
@@ -373,6 +451,14 @@
 #endif
 
 /**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+/**
  * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
  * @note    Disabling this option saves both code and data space.
  */
@@ -380,6 +466,14 @@
 #define SPI_USE_MUTUAL_EXCLUSION    TRUE
 #endif
 
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
 /*===========================================================================*/
 /* UART driver related settings.                                             */
 /*===========================================================================*/
@@ -412,6 +506,26 @@
 #define USB_USE_WAIT                FALSE
 #endif
 
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
 #include "halconf_community.h"
 
 #endif /* HALCONF_H */
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/main.c b/testhal/STM32/STM32F4xx/USB_HOST/main.c
index 6bc859e..c88880b 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/main.c
+++ b/testhal/STM32/STM32F4xx/USB_HOST/main.c
@@ -389,14 +389,14 @@ start:
 

         usbDbgPuts("FS: Block driver ready, try mount...");

 

-        res = f_mount(&MSDLUN0FS, FATFSDEV_MSDLUN0_DRIVE, 1);

+        res = f_mount(&MSDLUN0FS, FATFSDEV_MSD_DRIVE, 1);

         if (res != FR_OK) {

             usbDbgPuts("FS: Can't mount. Check file system.");

             continue;

         }

         usbDbgPuts("FS: Mounted.");

 

-        res = f_getfree(FATFSDEV_MSDLUN0_DRIVE, &clusters, &fsp);

+        res = f_getfree(FATFSDEV_MSD_DRIVE, &clusters, &fsp);

         if (res != FR_OK) {

             usbDbgPuts("FS: f_getfree() failed");

             continue;

@@ -420,7 +420,7 @@ start:
         //write test

         if (1) {

             usbDbgPuts("FS: Write test (create file /test.dat, 1MB)");

-            f_open(&file, FATFSDEV_MSDLUN0_DRIVE "/test.dat", FA_CREATE_ALWAYS | FA_WRITE);

+            f_open(&file, FATFSDEV_MSD_DRIVE "/test.dat", FA_CREATE_ALWAYS | FA_WRITE);

             src = start;

             st = chVTGetSystemTime();

             for (j = 0; j < 2048; j++) {

@@ -440,7 +440,7 @@ start:
         //read test

         if (1) {

             usbDbgPuts("FS: Read test (read file /test.dat, 1MB, compare)");

-            f_open(&file, FATFSDEV_MSDLUN0_DRIVE "/test.dat", FA_READ);

+            f_open(&file, FATFSDEV_MSD_DRIVE "/test.dat", FA_READ);

             src = start;

             st = chVTGetSystemTime();

             for (j = 0; j < 2048; j++) {

@@ -464,7 +464,7 @@ start:
         //scan files test

         if (1) {

             usbDbgPuts("FS: Scan files test");

-            strcpy((char *)fbuff, FATFSDEV_MSDLUN0_DRIVE);

+            strcpy((char *)fbuff, FATFSDEV_MSD_DRIVE);

             scan_files(chp, (char *)fbuff);

         }

     }

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/mcuconf.h b/testhal/STM32/STM32F4xx/USB_HOST/mcuconf.h
index d2ff44e..242a0e3 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/mcuconf.h
@@ -32,11 +32,18 @@
  */
 
 #define STM32F4xx_MCUCONF
+#define STM32F405_MCUCONF
+#define STM32F415_MCUCONF
+#define STM32F407_MCUCONF
+#define STM32F417_MCUCONF
 
 /*
  * HAL driver system settings.
  */
 #define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
 #define STM32_HSI_ENABLED                   TRUE
 #define STM32_LSI_ENABLED                   TRUE
 #define STM32_HSE_ENABLED                   TRUE
@@ -60,9 +67,6 @@
 #define STM32_I2SSRC                        STM32_I2SSRC_CKIN
 #define STM32_PLLI2SN_VALUE                 192
 #define STM32_PLLI2SR_VALUE                 5
-#define STM32_PVD_ENABLE                    FALSE
-#define STM32_PLS                           STM32_PLS_LEV0
-#define STM32_BKPRAM_ENABLE                 FALSE
 
 /*
  * IRQ system settings.
@@ -234,6 +238,14 @@
 #define STM32_PWM_TIM9_IRQ_PRIORITY         7
 
 /*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
+
+/*
  * SDC driver system settings.
  */
 #define STM32_SDC_SDIO_DMA_PRIORITY         3
@@ -330,9 +342,7 @@
 #define STM32_USB_OTG2_IRQ_PRIORITY         14
 #define STM32_USB_OTG1_RX_FIFO_SIZE         512
 #define STM32_USB_OTG2_RX_FIFO_SIZE         1024
-#define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
-#define STM32_USB_OTG_THREAD_STACK_SIZE     128
-#define STM32_USB_OTGFIFO_FILL_BASEPRI      0
+#define STM32_USB_HOST_WAKEUP_DURATION      2
 
 /*
  * WDG driver system settings.