USBH: testhal: fix compile with ChibiOS 18.2

3 files changed, 16 insertions, 150 deletions

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
index 54c23ca..e38a6e5 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
@@ -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-nil/osal.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

@@ -216,6 +216,6 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

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

-include $(RULESPATH)/arm-none-eabi.mk

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

+#include $(RULESPATH)/arm-none-eabi.mk

 include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/chconf.h b/testhal/STM32/STM32F4xx/USB_HOST/chconf.h
index 40612ff..0788ce6 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/chconf.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/chconf.h
@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    rt/templates/chconf.h

+ * @file    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.

@@ -29,7 +29,7 @@
 #define CHCONF_H

 

 #define _CHIBIOS_RT_CONF_

-#define _CHIBIOS_RT_CONF_VER_6_1_

+#define _CHIBIOS_RT_CONF_VER_5_1_

 

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

 /**

@@ -360,7 +360,7 @@
 #endif

 

 /**

- * @brief   Objects FIFOs APIs.

+ * @brief  Objects FIFOs APIs.

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

  *          in the kernel.

  *

@@ -371,17 +371,6 @@
 #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.

  * @details If enabled then the dynamic threads creation APIs are included

  *          in the kernel.

@@ -458,13 +447,6 @@
 #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

-

 /** @} */

 

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

@@ -692,8 +674,6 @@
  */

 #define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \

   /* System halt code here.*/                                               \

-  void usbDbgSystemHalted(void); \

-  usbDbgSystemHalted(); \

 }

 

 /**

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/halconf.h b/testhal/STM32/STM32F4xx/USB_HOST/halconf.h
index 8b5d823..7096a3b 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/halconf.h
+++ b/testhal/STM32/STM32F4xx/USB_HOST/halconf.h
@@ -28,9 +28,6 @@
 #ifndef HALCONF_H
 #define HALCONF_H
 
-#define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_7_1_
-
 #include "mcuconf.h"
 
 /**
@@ -69,10 +66,10 @@
 #endif
 
 /**
- * @brief   Enables the EFlash subsystem.
+ * @brief   Enables the EXT subsystem.
  */
-#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
-#define HAL_USE_EFL                         FALSE
+#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
+#define HAL_USE_EXT                 FALSE
 #endif
 
 /**
@@ -125,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__)
@@ -153,13 +157,6 @@
 #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__)
@@ -167,13 +164,6 @@
 #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__)
@@ -194,33 +184,6 @@
 #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.                                              */
 /*===========================================================================*/
@@ -252,13 +215,6 @@
 #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.                                              */
 /*===========================================================================*/
@@ -282,26 +238,6 @@
 #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.                                              */
 /*===========================================================================*/
 
@@ -377,20 +313,6 @@
 #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.                                           */
 /*===========================================================================*/
@@ -451,14 +373,6 @@
 #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.
  */
@@ -466,14 +380,6 @@
 #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.                                             */
 /*===========================================================================*/
@@ -506,26 +412,6 @@
 #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 */