testhal: stm32: update to latest ChibiOS API

19 files changed, 499 insertions, 73 deletions

diff --git a/testhal/STM32/STM32F1xx/qei/halconf_community.h b/testhal/STM32/STM32F1xx/qei/halconf_community.h
index 9c28ead..95f1ee6 100644
--- a/testhal/STM32/STM32F1xx/qei/halconf_community.h
+++ b/testhal/STM32/STM32F1xx/qei/halconf_community.h
@@ -100,6 +100,24 @@
  */

 #define ONEWIRE_USE_SEARCH_ROM      FALSE

 

+/*===========================================================================*/

+/* QEI driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables discard of overlow

+ */

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

+#define QEI_USE_OVERFLOW_DISCARD    FALSE

+#endif

+

+/**

+ * @brief   Enables min max of overlow

+ */

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

+#define QEI_USE_OVERFLOW_MINMAX     FALSE

+#endif

+

 #endif /* HALCONF_COMMUNITY_H */

 

 /** @} */

diff --git a/testhal/STM32/STM32F3xx/COMP/Makefile b/testhal/STM32/STM32F3xx/COMP/Makefile
index 90ada53..e19b2ee 100644
--- a/testhal/STM32/STM32F3xx/COMP/Makefile
+++ b/testhal/STM32/STM32F3xx/COMP/Makefile
@@ -10,7 +10,7 @@ endif
 

 # C specific options here (added to USE_OPT).

 ifeq ($(USE_COPT),)

-  USE_COPT = 

+  USE_COPT =

 endif

 

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

@@ -69,7 +69,7 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
   USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

-# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

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

 ifeq ($(USE_FPU),)

   USE_FPU = no

 endif

@@ -99,7 +99,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk

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

 # Other files (optional).

-#include $(CHIBIOS)/test/rt/test.mk

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

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

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

 

 # Define linker script file here

 LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld

diff --git a/testhal/STM32/STM32F3xx/COMP/halconf.h b/testhal/STM32/STM32F3xx/COMP/halconf.h
index 2471ec7..77a7055 100644
--- a/testhal/STM32/STM32F3xx/COMP/halconf.h
+++ b/testhal/STM32/STM32F3xx/COMP/halconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

@@ -52,6 +52,13 @@
 #endif

 

 /**

+ * @brief   Enables the cryptographic subsystem.

+ */

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

+#define HAL_USE_CRY                 FALSE

+#endif

+

+/**

  * @brief   Enables the DAC subsystem.

  */

 #if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)

@@ -62,7 +69,7 @@
  * @brief   Enables the EXT subsystem.

  */

 #if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)

-#define HAL_USE_EXT                 TRUE

+#define HAL_USE_EXT                 FALSE

 #endif

 

 /**

@@ -115,6 +122,13 @@
 #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__)

@@ -202,6 +216,28 @@
 #endif

 

 /*===========================================================================*/

+/* CRY driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables the SW fall-back of the cryptographic driver.

+ * @details When enabled, this option, activates a fall-back software

+ *          implementation for algorithms not supported by the underlying

+ *          hardware.

+ * @note    Fall-back implementations may not be present for all algorithms.

+ */

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

+#define HAL_CRY_USE_FALLBACK                FALSE

+#endif

+

+/**

+ * @brief   Makes the driver forcibly use the fall-back implementations.

+ */

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

+#define HAL_CRY_ENFORCE_FALLBACK            FALSE

+#endif

+

+/*===========================================================================*/

 /* I2C driver related settings.                                              */

 /*===========================================================================*/

 

diff --git a/testhal/STM32/STM32F3xx/COMP/mcuconf.h b/testhal/STM32/STM32F3xx/COMP/mcuconf.h
index 0d37614..a270b6f 100644
--- a/testhal/STM32/STM32F3xx/COMP/mcuconf.h
+++ b/testhal/STM32/STM32F3xx/COMP/mcuconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

@@ -67,6 +67,25 @@
 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI16_PRIORITY           6

+#define STM32_IRQ_EXTI17_PRIORITY           6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_29_PRIORITY     6

+#define STM32_IRQ_EXTI30_32_PRIORITY        6

+#define STM32_IRQ_EXTI33_PRIORITY           6

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -111,25 +130,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI21_22_29_IRQ_PRIORITY 6

-#define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI33_IRQ_PRIORITY       6

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/testhal/STM32/STM32F3xx/EEProm/Makefile b/testhal/STM32/STM32F3xx/EEProm/Makefile
index 90ada53..bd22f9f 100644
--- a/testhal/STM32/STM32F3xx/EEProm/Makefile
+++ b/testhal/STM32/STM32F3xx/EEProm/Makefile
@@ -10,7 +10,7 @@ endif
 

 # C specific options here (added to USE_OPT).

 ifeq ($(USE_COPT),)

-  USE_COPT = 

+  USE_COPT =

 endif

 

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

@@ -69,7 +69,7 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
   USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

-# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

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

 ifeq ($(USE_FPU),)

   USE_FPU = no

 endif

@@ -99,7 +99,7 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk

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

 # Other files (optional).

-#include $(CHIBIOS)/test/rt/test.mk

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

 

 # Define linker script file here

 LDSCRIPT= $(STARTUPLD)/STM32F303xC.ld

diff --git a/testhal/STM32/STM32F3xx/EEProm/main.c b/testhal/STM32/STM32F3xx/EEProm/main.c
index 130a600..4460ef6 100644
--- a/testhal/STM32/STM32F3xx/EEProm/main.c
+++ b/testhal/STM32/STM32F3xx/EEProm/main.c
@@ -24,6 +24,7 @@
 #define EEPROM_SPIDCONFIG spi1cfg

 

 static const SPIConfig EEPROM_SPIDCONFIG = {

+  false,

   NULL,

   GPIOA,

   12,

@@ -36,7 +37,7 @@ static SPIEepromFileConfig eeCfg = {
   EEPROM_SIZE,

   EEPROM_SIZE,

   EEPROM_PAGE_SIZE,

-  MS2ST(EEPROM_WRITE_TIME_MS),

+  TIME_MS2I(EEPROM_WRITE_TIME_MS),

   &EEPROM_SPID,

   &EEPROM_SPIDCONFIG,

 };

diff --git a/testhal/STM32/STM32F4xx/EICU/main.c b/testhal/STM32/STM32F4xx/EICU/main.c
index 90f8eb1..a6dbf8a 100644
--- a/testhal/STM32/STM32F4xx/EICU/main.c
+++ b/testhal/STM32/STM32F4xx/EICU/main.c
@@ -35,10 +35,10 @@ typedef struct {
 /*

  * Chose values suitable for measurement using 16-bit timer on 1MHz

  */

-static pulse_t pulse_led3 = {MS2ST(2), MS2ST(59), GPIOD_LED3};

-static pulse_t pulse_led4 = {MS2ST(3), MS2ST(53), GPIOD_LED4};

-static pulse_t pulse_led5 = {MS2ST(5), MS2ST(47), GPIOD_LED5};

-static pulse_t pulse_led6 = {MS2ST(7), MS2ST(43), GPIOD_LED6};

+static pulse_t pulse_led3 = {TIME_MS2I(2), TIME_MS2I(59), GPIOD_LED3};

+static pulse_t pulse_led4 = {TIME_MS2I(3), TIME_MS2I(53), GPIOD_LED4};

+static pulse_t pulse_led5 = {TIME_MS2I(5), TIME_MS2I(47), GPIOD_LED5};

+static pulse_t pulse_led6 = {TIME_MS2I(7), TIME_MS2I(43), GPIOD_LED6};

 

 /*

  *

@@ -72,19 +72,19 @@ void eicu_cb(EICUDriver *eicup, eicuchannel_t channel, uint32_t w, uint32_t p) {
   (void)p;

   switch (channel) {

   case EICU_CHANNEL_1:

-    if (abs((int32_t)w - (int32_t)ST2US(pulse_led3.high)) > tolerance)

+    if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led3.high)) > tolerance)

       osalSysHalt("ch1");

     break;

   case EICU_CHANNEL_2:

-    if (abs((int32_t)w - (int32_t)ST2US(pulse_led4.high)) > tolerance)

+    if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led4.high)) > tolerance)

       osalSysHalt("ch2");

     break;

   case EICU_CHANNEL_3:

-    if (abs((int32_t)w - (int32_t)ST2US(pulse_led5.high)) > tolerance)

+    if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led5.high)) > tolerance)

       osalSysHalt("ch3");

     break;

   case EICU_CHANNEL_4:

-    if (abs((int32_t)w - (int32_t)ST2US(pulse_led6.high)) > tolerance)

+    if (abs((int32_t)w - (int32_t)TIME_I2US(pulse_led6.high)) > tolerance)

       osalSysHalt("ch4");

     break;

   default:

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_SDRAM/halconf.h b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf.h
index e690d15..dbc1950 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf.h
@@ -62,7 +62,7 @@
  * @brief   Enables the EXT subsystem.
  */
 #if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 TRUE
+#define HAL_USE_EXT                 FALSE
 #endif
 
 /**
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/FSMC_SRAM/halconf.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf.h
index e690d15..dbc1950 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf.h
@@ -62,7 +62,7 @@
  * @brief   Enables the EXT subsystem.
  */
 #if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                 TRUE
+#define HAL_USE_EXT                 FALSE
 #endif
 
 /**
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
index dfda9ac..c0561f4 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
@@ -99,7 +99,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk

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

 # Other files (optional).

-include $(CHIBIOS)/test/rt/test.mk

+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

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 9b22a79..d59e0e7 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
@@ -89,7 +89,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	  MS2ST(1000)

+#define HAL_USBH_CONTROL_REQUEST_DEFAULT_TIMEOUT	  OSAL_MS2I(1000)

 

 /* MSD */

 #define HAL_USBH_USE_MSD                              TRUE

diff --git a/testhal/STM32/STM32F7xx/USB_MSD/Makefile b/testhal/STM32/STM32F7xx/USB_MSD/Makefile
index 8f4695f..4de0c47 100644
--- a/testhal/STM32/STM32F7xx/USB_MSD/Makefile
+++ b/testhal/STM32/STM32F7xx/USB_MSD/Makefile
@@ -10,7 +10,7 @@ endif
 
 # C specific options here (added to USE_OPT).
 ifeq ($(USE_COPT),)
-  USE_COPT = 
+  USE_COPT =
 endif
 
 # C++ specific options here (added to USE_OPT).
@@ -91,7 +91,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Startup files.
@@ -105,7 +105,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
-include $(CHIBIOS)/test/rt/test.mk
+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
 
diff --git a/testhal/STM32/STM32F7xx/USB_MSD/chconf.h b/testhal/STM32/STM32F7xx/USB_MSD/chconf.h
index 346c876..b9b2e81 100644
--- a/testhal/STM32/STM32F7xx/USB_MSD/chconf.h
+++ b/testhal/STM32/STM32F7xx/USB_MSD/chconf.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -52,6 +52,18 @@
 #define CH_CFG_ST_FREQUENCY                 10000
 
 /**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#define CH_CFG_INTERVALS_SIZE               32
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#define CH_CFG_TIME_TYPES_SIZE              32
+
+/**
  * @brief   Time delta constant for the tick-less mode.
  * @note    If this value is zero then the system uses the classic
  *          periodic tick. This value represents the minimum number
@@ -296,6 +308,15 @@
 #define CH_CFG_USE_MEMPOOLS                 TRUE
 
 /**
+ * @brief  Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+
+/**
  * @brief   Dynamic Threads APIs.
  * @details If enabled then the dynamic threads creation APIs are included
  *          in the kernel.
@@ -310,6 +331,56 @@
 
 /*===========================================================================*/
 /**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#define CH_CFG_USE_FACTORY                  FALSE
+
+/**
+ * @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.
+ */
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#define CH_CFG_FACTORY_SEMAPHORES           TRUE
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#define CH_CFG_FACTORY_MAILBOXES            TRUE
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#define CH_CFG_FACTORY_OBJ_FIFOS            TRUE
+
+/** @} */
+
+/*===========================================================================*/
+/**
  * @name Debug options
  * @{
  */
@@ -408,6 +479,22 @@
 /*===========================================================================*/
 
 /**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
  * @brief   Threads descriptor structure extension.
  * @details User fields added to the end of the @p thread_t structure.
  */
@@ -416,9 +503,9 @@
 
 /**
  * @brief   Threads initialization hook.
- * @details User initialization code added to the @p chThdInit() API.
+ * @details User initialization code added to the @p _thread_init() function.
  *
- * @note    It is invoked from within @p chThdInit() and implicitly from all
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
  *          the threads creation APIs.
  */
 #define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
diff --git a/testhal/STM32/STM32F7xx/USB_MSD/mcuconf.h b/testhal/STM32/STM32F7xx/USB_MSD/mcuconf.h
index c7bf7a1..bf40512 100644
--- a/testhal/STM32/STM32F7xx/USB_MSD/mcuconf.h
+++ b/testhal/STM32/STM32F7xx/USB_MSD/mcuconf.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #define MCUCONF_H
 
 /*
- * STM32F4xx drivers configuration.
+ * STM32F7xx drivers configuration.
  * The following settings override the default settings present in
  * the various device driver implementation headers.
  * Note that the settings for each driver only have effect if the whole
@@ -60,18 +60,21 @@
 #define STM32_MCO1PRE                       STM32_MCO1PRE_DIV1
 #define STM32_MCO2SEL                       STM32_MCO2SEL_SYSCLK
 #define STM32_MCO2PRE                       STM32_MCO2PRE_DIV4
-#define STM32_I2SSRC                        STM32_I2SSRC_PLLI2S
+#define STM32_I2SSRC                        STM32_I2SSRC_OFF
 #define STM32_PLLI2SN_VALUE                 192
 #define STM32_PLLI2SP_VALUE                 4
 #define STM32_PLLI2SQ_VALUE                 4
 #define STM32_PLLI2SR_VALUE                 4
+#define STM32_PLLI2SDIVQ_VALUE              2
 #define STM32_PLLSAIN_VALUE                 192
 #define STM32_PLLSAIP_VALUE                 4
 #define STM32_PLLSAIQ_VALUE                 4
 #define STM32_PLLSAIR_VALUE                 4
-#define STM32_PLLSAIDIVR                    STM32_PLLSAIDIVR_OFF
+#define STM32_PLLSAIDIVQ_VALUE              2
+#define STM32_PLLSAIDIVR_VALUE              2
 #define STM32_SAI1SEL                       STM32_SAI1SEL_OFF
 #define STM32_SAI2SEL                       STM32_SAI2SEL_OFF
+#define STM32_LCDTFT_REQUIRED               FALSE
 #define STM32_USART1SEL                     STM32_USART1SEL_PCLK2
 #define STM32_USART2SEL                     STM32_USART2SEL_PCLK1
 #define STM32_USART3SEL                     STM32_USART3SEL_PCLK1
@@ -87,10 +90,28 @@
 #define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_PCLK1
 #define STM32_CECSEL                        STM32_CECSEL_LSE
 #define STM32_CK48MSEL                      STM32_CK48MSEL_PLL
-#define STM32_SDMMCSEL                      STM32_SDMMCSEL_PLL48CLK
+#define STM32_SDMMC1SEL                     STM32_SDMMC1SEL_PLL48CLK
 #define STM32_SRAM2_NOCACHE                 FALSE
 
 /*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           15
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           6
+#define STM32_IRQ_EXTI20_PRIORITY           6
+#define STM32_IRQ_EXTI21_PRIORITY           15
+#define STM32_IRQ_EXTI22_PRIORITY           15
+
+/*
  * ADC driver system settings.
  */
 #define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4
@@ -113,8 +134,10 @@
  */
 #define STM32_CAN_USE_CAN1                  FALSE
 #define STM32_CAN_USE_CAN2                  FALSE
+#define STM32_CAN_USE_CAN3                  FALSE
 #define STM32_CAN_CAN1_IRQ_PRIORITY         11
 #define STM32_CAN_CAN2_IRQ_PRIORITY         11
+#define STM32_CAN_CAN3_IRQ_PRIORITY         11
 
 /*
  * DAC driver system settings.
@@ -130,24 +153,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 6)
 
 /*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6
-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6
-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6
-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI17_IRQ_PRIORITY       15
-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6
-#define STM32_EXT_EXTI21_IRQ_PRIORITY       15
-#define STM32_EXT_EXTI22_IRQ_PRIORITY       15
-
-/*
  * GPT driver system settings.
  */
 #define STM32_GPT_USE_TIM1                  FALSE