From 0e89bf1018b13ab298f22a30f50bf662798121be Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 12 Jun 2019 14:55:26 -0400 Subject: [PATCH] reducing code duplication --- firmware/config/boards/nucleo_f746/board.h | 15 --------------- firmware/config/boards/nucleo_f767/board.h | 15 --------------- firmware/config/boards/prometheus/board.h | 14 -------------- firmware/config/boards/st_stm32f4/board.h | 14 -------------- firmware/config/boards/subaru-ej20gn/board.h | 15 --------------- firmware/config/chconf_common.h | 15 +++++++++++++++ 6 files changed, 15 insertions(+), 73 deletions(-) diff --git a/firmware/config/boards/nucleo_f746/board.h b/firmware/config/boards/nucleo_f746/board.h index f381d05554..9bfa0d08cf 100644 --- a/firmware/config/boards/nucleo_f746/board.h +++ b/firmware/config/boards/nucleo_f746/board.h @@ -1856,19 +1856,4 @@ /* External declarations. */ /*===========================================================================*/ -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); - void setBoardConfigurationOverrides(void); - void setPinConfigurationOverrides(void); - void setSerialConfigurationOverrides(void); - void setSdCardConfigurationOverrides(void); - void setAdcChannelOverrides(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - #endif /* BOARD_H */ diff --git a/firmware/config/boards/nucleo_f767/board.h b/firmware/config/boards/nucleo_f767/board.h index 059511d713..9ad896e885 100644 --- a/firmware/config/boards/nucleo_f767/board.h +++ b/firmware/config/boards/nucleo_f767/board.h @@ -1861,19 +1861,4 @@ /* External declarations. */ /*===========================================================================*/ -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); - void setBoardConfigurationOverrides(void); - void setPinConfigurationOverrides(void); - void setSerialConfigurationOverrides(void); - void setSdCardConfigurationOverrides(void); - void setAdcChannelOverrides(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - #endif /* BOARD_H */ diff --git a/firmware/config/boards/prometheus/board.h b/firmware/config/boards/prometheus/board.h index bcc0a568ba..230ce3bc98 100644 --- a/firmware/config/boards/prometheus/board.h +++ b/firmware/config/boards/prometheus/board.h @@ -1621,19 +1621,5 @@ PIN_AFIO_AF(GPIOK_PIN14, 0) | \ PIN_AFIO_AF(GPIOK_PIN15, 0)) -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); - void setBoardConfigurationOverrides(void); - void setPinConfigurationOverrides(void); - void setSerialConfigurationOverrides(void); - void setSdCardConfigurationOverrides(void); - void setAdcChannelOverrides(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ #endif /* BOARD_H */ diff --git a/firmware/config/boards/st_stm32f4/board.h b/firmware/config/boards/st_stm32f4/board.h index 2581f8a4f7..11aa5e44e2 100644 --- a/firmware/config/boards/st_stm32f4/board.h +++ b/firmware/config/boards/st_stm32f4/board.h @@ -1345,19 +1345,5 @@ PIN_AFIO_AF(GPIOI_PIN15, 0U)) -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); - void setBoardConfigurationOverrides(void); - void setPinConfigurationOverrides(void); - void setSerialConfigurationOverrides(void); - void setSdCardConfigurationOverrides(void); - void setAdcChannelOverrides(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ #endif /* BOARD_H */ diff --git a/firmware/config/boards/subaru-ej20gn/board.h b/firmware/config/boards/subaru-ej20gn/board.h index 382c844c69..077460348c 100644 --- a/firmware/config/boards/subaru-ej20gn/board.h +++ b/firmware/config/boards/subaru-ej20gn/board.h @@ -864,19 +864,4 @@ PIN_AFIO_AF( 1, 0U)) #define VAL_GPIOH_AFRH (0) -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); - void setBoardConfigurationOverrides(void); - void setPinConfigurationOverrides(void); - void setSerialConfigurationOverrides(void); - void setSdCardConfigurationOverrides(void); - void setAdcChannelOverrides(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - #endif /* BOARD_H */ diff --git a/firmware/config/chconf_common.h b/firmware/config/chconf_common.h index e8ad8b1350..fe31300cc2 100644 --- a/firmware/config/chconf_common.h +++ b/firmware/config/chconf_common.h @@ -49,5 +49,20 @@ extern "C" #define ON_UNLOCK_HOOK #endif /* EFI_CLOCK_LOCKS */ +#if !defined(_FROM_ASM_) +#ifdef __cplusplus +extern "C" { +#endif + void boardInit(void); + void setBoardConfigurationOverrides(void); + void setPinConfigurationOverrides(void); + void setSerialConfigurationOverrides(void); + void setSdCardConfigurationOverrides(void); + void setAdcChannelOverrides(void); +#ifdef __cplusplus +} +#endif +#endif /* _FROM_ASM_ */ + #endif /* CONFIG_CHCONF_COMMON_H_ */