From 69370d58d34f7fc8016176f724f30e5c881f520b Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Tue, 31 Mar 2020 11:55:38 +0000 Subject: [PATCH] Moved ADuCM Serial Driver under a common folder as the driver will be shared across different platforms. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13491 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/ADUCM/ADUCM36x/platform.mk | 3 +-- os/hal/ports/ADUCM/LLD/UARTv1/driver.mk | 9 +++++++++ .../ADUCM/{ADUCM36x => LLD/UARTv1}/hal_serial_lld.c | 4 ++-- .../ADUCM/{ADUCM36x => LLD/UARTv1}/hal_serial_lld.h | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 os/hal/ports/ADUCM/LLD/UARTv1/driver.mk rename os/hal/ports/ADUCM/{ADUCM36x => LLD/UARTv1}/hal_serial_lld.c (95%) rename os/hal/ports/ADUCM/{ADUCM36x => LLD/UARTv1}/hal_serial_lld.h (95%) diff --git a/os/hal/ports/ADUCM/ADUCM36x/platform.mk b/os/hal/ports/ADUCM/ADUCM36x/platform.mk index 6f7debbe7..232f182ed 100644 --- a/os/hal/ports/ADUCM/ADUCM36x/platform.mk +++ b/os/hal/ports/ADUCM/ADUCM36x/platform.mk @@ -3,7 +3,6 @@ PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \ $(CHIBIOS)/os/hal/ports/ADUCM/ADUCM36x/aducm_isr.c \ $(CHIBIOS)/os/hal/ports/ADUCM/ADUCM36x/hal_lld.c \ $(CHIBIOS)/os/hal/ports/ADUCM/ADUCM36x/hal_pal_lld.c \ - $(CHIBIOS)/os/hal/ports/ADUCM/ADUCM36x/hal_serial_lld.c \ $(CHIBIOS)/os/hal/ports/ADUCM/ADUCM36x/hal_spi_lld.c \ $(CHIBIOS)/os/hal/ports/ADUCM/ADUCM36x/hal_st_lld.c @@ -29,7 +28,7 @@ else endif # Drivers compatible with the platform. -# include $(CHIBIOS)/os/hal/ports/ADUCM/ADUCM36x/GPIOv1/driver.mk +include $(CHIBIOS)/os/hal/ports/ADUCM/LLD/UARTv1/driver.mk # Shared variables ALLCSRC += $(PLATFORMSRC) diff --git a/os/hal/ports/ADUCM/LLD/UARTv1/driver.mk b/os/hal/ports/ADUCM/LLD/UARTv1/driver.mk new file mode 100644 index 000000000..766101df7 --- /dev/null +++ b/os/hal/ports/ADUCM/LLD/UARTv1/driver.mk @@ -0,0 +1,9 @@ +ifeq ($(USE_SMART_BUILD),yes) +ifneq ($(findstring HAL_USE_SERIAL TRUE,$(HALCONF)),) +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.c +endif +else +PLATFORMSRC += $(CHIBIOS)/os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.c +endif + +PLATFORMINC += $(CHIBIOS)/os/hal/ports/ADUCM/LLD/UARTv1 diff --git a/os/hal/ports/ADUCM/ADUCM36x/hal_serial_lld.c b/os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.c similarity index 95% rename from os/hal/ports/ADUCM/ADUCM36x/hal_serial_lld.c rename to os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.c index 275d7ea92..0bf8b29c3 100644 --- a/os/hal/ports/ADUCM/ADUCM36x/hal_serial_lld.c +++ b/os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.c @@ -15,8 +15,8 @@ */ /** - * @file ADUCM36x/hal_serial_lld.c - * @brief ADUCM serial subsystem low level driver source. + * @file UARTv1/hal_serial_lld.c + * @brief ADUCM low level serial driver code. * * @addtogroup SERIAL * @{ diff --git a/os/hal/ports/ADUCM/ADUCM36x/hal_serial_lld.h b/os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.h similarity index 95% rename from os/hal/ports/ADUCM/ADUCM36x/hal_serial_lld.h rename to os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.h index 5c26d2813..1ac540a8d 100644 --- a/os/hal/ports/ADUCM/ADUCM36x/hal_serial_lld.h +++ b/os/hal/ports/ADUCM/LLD/UARTv1/hal_serial_lld.h @@ -15,8 +15,8 @@ */ /** - * @file ADUCM36x/hal_serial_lld.h - * @brief ADUCM serial subsystem low level driver header. + * @file UARTv1/hal_serial_lld.c + * @brief ADUCM low level serial driver header. * * @addtogroup SERIAL * @{