From 0d91f46b3b90764b901263504e14002d34a1f818 Mon Sep 17 00:00:00 2001 From: mahi Date: Mon, 17 Dec 2012 11:15:49 +0100 Subject: [PATCH] #ifdef:ed all Det includes --- arch/arm/arm_cm3/drivers/Adc.c | 2 ++ arch/arm/arm_cm3/drivers/Can.c | 4 +++- arch/arm/arm_cm3/drivers/Dio.c | 2 ++ arch/arm/arm_cm3/drivers/Gpt.c | 2 ++ arch/arm/arm_cm3/drivers/Mcu.c | 2 ++ arch/arm/arm_cm3/drivers/Port.c | 2 ++ arch/arm/arm_cm3/drivers/Pwm.c | 2 ++ arch/arm/arm_cr4/drivers/Can.c | 2 ++ arch/arm/arm_cr4/drivers/Dio.c | 2 ++ arch/arm/arm_cr4/drivers/Mcu.c | 2 ++ arch/arm/arm_cr4/drivers/Port.c | 2 ++ arch/generic/linux/drivers/Mcu.c | 2 ++ arch/hc1x/hcs12d/drivers/Adc.c | 2 ++ arch/hc1x/hcs12d/drivers/Can.c | 2 ++ arch/hc1x/hcs12d/drivers/Dio.c | 2 ++ arch/hc1x/hcs12d/drivers/Gpt.c | 2 ++ arch/hc1x/hcs12d/drivers/Mcu.c | 2 ++ arch/hc1x/hcs12d/drivers/Port.c | 2 ++ arch/hc1x/hcs12d/drivers/Pwm.c | 2 ++ arch/ppc/mpc55xx/drivers/Adc_560x.c | 2 ++ arch/ppc/mpc55xx/drivers/Adc_eQADC.c | 2 ++ arch/ppc/mpc55xx/drivers/Can.c | 2 ++ arch/ppc/mpc55xx/drivers/Dio.c | 2 ++ arch/ppc/mpc55xx/drivers/Eep.c | 2 ++ arch/ppc/mpc55xx/drivers/Fls.c | 2 ++ arch/ppc/mpc55xx/drivers/Gpt.c | 2 ++ arch/ppc/mpc55xx/drivers/Lin.c | 2 ++ arch/ppc/mpc55xx/drivers/LinFlex.c | 2 ++ arch/ppc/mpc55xx/drivers/Mcu.c | 2 ++ arch/ppc/mpc55xx/drivers/Port.c | 2 ++ arch/ppc/mpc55xx/drivers/Pwm.c | 3 ++- arch/ppc/mpc55xx/drivers/PwmFlex.c | 3 ++- arch/ppc/mpc55xx/drivers/Spi.c | 2 ++ communication/CanIf/CanIf.c | 3 ++- communication/CanNm/CanNm.c | 2 ++ communication/CanSM/CanSM.c | 2 ++ communication/CanTp/CanTp.c | 2 ++ communication/Com/Com_Com.c | 2 ++ communication/Com/Com_Internal.h | 2 ++ communication/ComM/ComM.c | 2 ++ communication/Lin/LinIf.c | 2 ++ communication/Lin/LinSM.c | 2 ++ communication/PduR/PduR.c | 4 ++-- communication/PduR/PduR_CanTp.c | 2 ++ communication/PduR/PduR_J1939Tp.c | 2 ++ communication/PduR/PduR_Logic.c | 2 ++ communication/PduR/PduR_SoAd.c | 4 ++-- diagnostic/Dcm/Dcm_Internal.h | 2 ++ diagnostic/Dem/Dem.c | 2 ++ diagnostic/Det/Det.c | 2 ++ drivers/Adc_Internal.c | 2 ++ drivers/Fls_SST25xx.c | 2 ++ include/CanIf.h | 2 ++ include/Fls.h | 2 ++ include/Fls_SST25xx.h | 2 ++ include/PduR_If.h | 2 ++ memory/Ea/Ea.c | 2 ++ memory/Fee/Fee.c | 2 ++ memory/NvM/NvM.c | 2 ++ system/EcuM/EcuM_Callout_Stubs.c | 2 ++ system/EcuM/EcuM_Internals.h | 2 ++ system/WdgIf/WdgIf.c | 2 ++ system/WdgM/WdgM.c | 2 ++ 63 files changed, 127 insertions(+), 8 deletions(-) diff --git a/arch/arm/arm_cm3/drivers/Adc.c b/arch/arm/arm_cm3/drivers/Adc.c index 7196a22c..91d1b94d 100644 --- a/arch/arm/arm_cm3/drivers/Adc.c +++ b/arch/arm/arm_cm3/drivers/Adc.c @@ -22,7 +22,9 @@ #include "Adc.h" #include "stm32f10x_adc.h" #include "stm32f10x_dma.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_KERNEL) #include "Os.h" #include "isr.h" diff --git a/arch/arm/arm_cm3/drivers/Can.c b/arch/arm/arm_cm3/drivers/Can.c index fb05fb78..13a3dcae 100644 --- a/arch/arm/arm_cm3/drivers/Can.c +++ b/arch/arm/arm_cm3/drivers/Can.c @@ -20,8 +20,10 @@ #include "stm32f10x_can.h" #include "Cpu.h" #include "Mcu.h" -#include "CanIf_Cbk.h" +#include "CanIf_Cbk.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/arm/arm_cm3/drivers/Dio.c b/arch/arm/arm_cm3/drivers/Dio.c index 7ca8cad3..aec04e00 100644 --- a/arch/arm/arm_cm3/drivers/Dio.c +++ b/arch/arm/arm_cm3/drivers/Dio.c @@ -16,7 +16,9 @@ #include "Std_Types.h" #include "Dio.h" +#if defined(USE_DET) #include "Det.h" +#endif #include #include "stm32f10x_gpio.h" diff --git a/arch/arm/arm_cm3/drivers/Gpt.c b/arch/arm/arm_cm3/drivers/Gpt.c index c62969ee..7184d28e 100644 --- a/arch/arm/arm_cm3/drivers/Gpt.c +++ b/arch/arm/arm_cm3/drivers/Gpt.c @@ -59,7 +59,9 @@ #include #include #include "Mcu.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_KERNEL) #include "Os.h" #include "isr.h" diff --git a/arch/arm/arm_cm3/drivers/Mcu.c b/arch/arm/arm_cm3/drivers/Mcu.c index 678249d2..9c73c3b8 100644 --- a/arch/arm/arm_cm3/drivers/Mcu.c +++ b/arch/arm/arm_cm3/drivers/Mcu.c @@ -16,7 +16,9 @@ #include "Std_Types.h" #include "Mcu.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/arm/arm_cm3/drivers/Port.c b/arch/arm/arm_cm3/drivers/Port.c index c2ad9c2c..9adb4fb4 100644 --- a/arch/arm/arm_cm3/drivers/Port.c +++ b/arch/arm/arm_cm3/drivers/Port.c @@ -16,7 +16,9 @@ #include "Port.h" /** @req PORT131 */ #include "stm32f10x.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "string.h" #include "stm32f10x_gpio.h" diff --git a/arch/arm/arm_cm3/drivers/Pwm.c b/arch/arm/arm_cm3/drivers/Pwm.c index 842dc57f..f3cf2bf5 100644 --- a/arch/arm/arm_cm3/drivers/Pwm.c +++ b/arch/arm/arm_cm3/drivers/Pwm.c @@ -19,7 +19,9 @@ * Author: jonte */ #include "Std_Types.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Mcu.h" #include "Os.h" #include "Pwm.h" diff --git a/arch/arm/arm_cr4/drivers/Can.c b/arch/arm/arm_cr4/drivers/Can.c index d1ecd333..ffe5be9f 100644 --- a/arch/arm/arm_cr4/drivers/Can.c +++ b/arch/arm/arm_cr4/drivers/Can.c @@ -19,7 +19,9 @@ #if defined(USE_DEM) #include "Dem.h" #endif +#if defined(USE_DET) #include "Det.h" +#endif #include "CanIf_Cbk.h" #include "Os.h" #include "isr.h" diff --git a/arch/arm/arm_cr4/drivers/Dio.c b/arch/arm/arm_cr4/drivers/Dio.c index 44c5db75..22c805b8 100644 --- a/arch/arm/arm_cr4/drivers/Dio.c +++ b/arch/arm/arm_cr4/drivers/Dio.c @@ -16,7 +16,9 @@ #include "Std_Types.h" #include "Dio.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Cpu.h" #include diff --git a/arch/arm/arm_cr4/drivers/Mcu.c b/arch/arm/arm_cr4/drivers/Mcu.c index b403dbb0..51e91dd5 100644 --- a/arch/arm/arm_cr4/drivers/Mcu.c +++ b/arch/arm/arm_cr4/drivers/Mcu.c @@ -16,7 +16,9 @@ #include "Std_Types.h" #include "Mcu.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/arm/arm_cr4/drivers/Port.c b/arch/arm/arm_cr4/drivers/Port.c index dfe86b2d..8c002a1d 100644 --- a/arch/arm/arm_cr4/drivers/Port.c +++ b/arch/arm/arm_cr4/drivers/Port.c @@ -16,7 +16,9 @@ #include "Std_Types.h" #include "Port.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Cpu.h" #include diff --git a/arch/generic/linux/drivers/Mcu.c b/arch/generic/linux/drivers/Mcu.c index 86065387..34a4a578 100644 --- a/arch/generic/linux/drivers/Mcu.c +++ b/arch/generic/linux/drivers/Mcu.c @@ -18,7 +18,9 @@ #include #include "Std_Types.h" #include "Mcu.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/hc1x/hcs12d/drivers/Adc.c b/arch/hc1x/hcs12d/drivers/Adc.c index a861b8ea..bb589a91 100644 --- a/arch/hc1x/hcs12d/drivers/Adc.c +++ b/arch/hc1x/hcs12d/drivers/Adc.c @@ -18,7 +18,9 @@ #include #include "Mcu.h" #include "Adc.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Os.h" #include "isr.h" #include "regs.h" diff --git a/arch/hc1x/hcs12d/drivers/Can.c b/arch/hc1x/hcs12d/drivers/Can.c index 7c872004..7e58c2a9 100644 --- a/arch/hc1x/hcs12d/drivers/Can.c +++ b/arch/hc1x/hcs12d/drivers/Can.c @@ -27,7 +27,9 @@ #include "Cpu.h" #include "Mcu.h" #include "CanIf_Cbk.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/hc1x/hcs12d/drivers/Dio.c b/arch/hc1x/hcs12d/drivers/Dio.c index 032e4d4b..255dd238 100644 --- a/arch/hc1x/hcs12d/drivers/Dio.c +++ b/arch/hc1x/hcs12d/drivers/Dio.c @@ -15,7 +15,9 @@ #include "Std_Types.h" #include "Dio.h" +#if defined(USE_DET) #include "Det.h" +#endif #include #include "regs.h" diff --git a/arch/hc1x/hcs12d/drivers/Gpt.c b/arch/hc1x/hcs12d/drivers/Gpt.c index e818a306..9e021224 100644 --- a/arch/hc1x/hcs12d/drivers/Gpt.c +++ b/arch/hc1x/hcs12d/drivers/Gpt.c @@ -23,7 +23,9 @@ #include "regs.h" #include "Mcu.h" #include "debug.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Os.h" #include "arc.h" #include "isr.h" diff --git a/arch/hc1x/hcs12d/drivers/Mcu.c b/arch/hc1x/hcs12d/drivers/Mcu.c index 5880dda9..565498a8 100644 --- a/arch/hc1x/hcs12d/drivers/Mcu.c +++ b/arch/hc1x/hcs12d/drivers/Mcu.c @@ -17,7 +17,9 @@ #include #include "Std_Types.h" #include "Mcu.h" +#if defined(USE_DET) #include "Det.h" +#endif #include #include "Cpu.h" #include diff --git a/arch/hc1x/hcs12d/drivers/Port.c b/arch/hc1x/hcs12d/drivers/Port.c index e6352d6a..8b45c296 100644 --- a/arch/hc1x/hcs12d/drivers/Port.c +++ b/arch/hc1x/hcs12d/drivers/Port.c @@ -16,7 +16,9 @@ #include "Std_Types.h" #include "Port.h" /** @req PORT131 */ #include "regs.h" +#if defined(USE_DET) #include "Det.h" +#endif #include /* SHORT ON HW diff --git a/arch/hc1x/hcs12d/drivers/Pwm.c b/arch/hc1x/hcs12d/drivers/Pwm.c index 97f8ca5c..2d02dee6 100644 --- a/arch/hc1x/hcs12d/drivers/Pwm.c +++ b/arch/hc1x/hcs12d/drivers/Pwm.c @@ -31,7 +31,9 @@ #include #include "Pwm.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Os.h" #include "Mcu.h" #include "regs.h" diff --git a/arch/ppc/mpc55xx/drivers/Adc_560x.c b/arch/ppc/mpc55xx/drivers/Adc_560x.c index 42ed7d6e..e71b5ee2 100644 --- a/arch/ppc/mpc55xx/drivers/Adc_560x.c +++ b/arch/ppc/mpc55xx/drivers/Adc_560x.c @@ -27,7 +27,9 @@ #include "Modules.h" #include "Mcu.h" #include "Adc.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Os.h" #include "isr.h" #include "irq.h" diff --git a/arch/ppc/mpc55xx/drivers/Adc_eQADC.c b/arch/ppc/mpc55xx/drivers/Adc_eQADC.c index 66a7caf8..017a75dd 100644 --- a/arch/ppc/mpc55xx/drivers/Adc_eQADC.c +++ b/arch/ppc/mpc55xx/drivers/Adc_eQADC.c @@ -20,7 +20,9 @@ #include "Modules.h" #include "Mcu.h" #include "Adc.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Os.h" #include "isr.h" #include "irq.h" diff --git a/arch/ppc/mpc55xx/drivers/Can.c b/arch/ppc/mpc55xx/drivers/Can.c index 3abf08b9..90d31ff6 100644 --- a/arch/ppc/mpc55xx/drivers/Can.c +++ b/arch/ppc/mpc55xx/drivers/Can.c @@ -141,7 +141,9 @@ #include "Cpu.h" #include "Mcu.h" #include "CanIf_Cbk.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/ppc/mpc55xx/drivers/Dio.c b/arch/ppc/mpc55xx/drivers/Dio.c index 2281fc5e..375805e3 100644 --- a/arch/ppc/mpc55xx/drivers/Dio.c +++ b/arch/ppc/mpc55xx/drivers/Dio.c @@ -27,7 +27,9 @@ #include "Std_Types.h" #include "Dio.h" +#if defined(USE_DET) #include "Det.h" +#endif #include #include "mpc55xx.h" diff --git a/arch/ppc/mpc55xx/drivers/Eep.c b/arch/ppc/mpc55xx/drivers/Eep.c index 6a3e58fb..aa8af99d 100644 --- a/arch/ppc/mpc55xx/drivers/Eep.c +++ b/arch/ppc/mpc55xx/drivers/Eep.c @@ -67,7 +67,9 @@ #if defined(USE_DEM) #include "Dem.h" #endif +#if defined(USE_DET) #include "Det.h" +#endif #include #include #include diff --git a/arch/ppc/mpc55xx/drivers/Fls.c b/arch/ppc/mpc55xx/drivers/Fls.c index 5cd12f7b..7dc0eb80 100644 --- a/arch/ppc/mpc55xx/drivers/Fls.c +++ b/arch/ppc/mpc55xx/drivers/Fls.c @@ -117,7 +117,9 @@ #include #include "Fls.h" #include "flash.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/ppc/mpc55xx/drivers/Gpt.c b/arch/ppc/mpc55xx/drivers/Gpt.c index b64edc18..7bb6404a 100644 --- a/arch/ppc/mpc55xx/drivers/Gpt.c +++ b/arch/ppc/mpc55xx/drivers/Gpt.c @@ -54,7 +54,9 @@ #include "mpc55xx.h" #include "Mcu.h" #include "debug.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Os.h" #include "isr.h" diff --git a/arch/ppc/mpc55xx/drivers/Lin.c b/arch/ppc/mpc55xx/drivers/Lin.c index 90530383..c828abd4 100644 --- a/arch/ppc/mpc55xx/drivers/Lin.c +++ b/arch/ppc/mpc55xx/drivers/Lin.c @@ -16,7 +16,9 @@ #include "Lin.h" #include "LinIf_Cbk.h" #include "mpc55xx.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Mcu.h" #include #include diff --git a/arch/ppc/mpc55xx/drivers/LinFlex.c b/arch/ppc/mpc55xx/drivers/LinFlex.c index 47866ddf..f121d408 100644 --- a/arch/ppc/mpc55xx/drivers/LinFlex.c +++ b/arch/ppc/mpc55xx/drivers/LinFlex.c @@ -16,7 +16,9 @@ #include "Lin.h" #include "LinIf_Cbk.h" #include "mpc55xx.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Mcu.h" #include #include diff --git a/arch/ppc/mpc55xx/drivers/Mcu.c b/arch/ppc/mpc55xx/drivers/Mcu.c index b1f2ce67..e7e5889b 100644 --- a/arch/ppc/mpc55xx/drivers/Mcu.c +++ b/arch/ppc/mpc55xx/drivers/Mcu.c @@ -19,7 +19,9 @@ #include #include "Std_Types.h" #include "Mcu.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/ppc/mpc55xx/drivers/Port.c b/arch/ppc/mpc55xx/drivers/Port.c index ab86d436..7eb47b14 100644 --- a/arch/ppc/mpc55xx/drivers/Port.c +++ b/arch/ppc/mpc55xx/drivers/Port.c @@ -23,7 +23,9 @@ #include "Std_Types.h" #include "Port.h" #include "mpc55xx.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/arch/ppc/mpc55xx/drivers/Pwm.c b/arch/ppc/mpc55xx/drivers/Pwm.c index f82faa4b..ea57b091 100644 --- a/arch/ppc/mpc55xx/drivers/Pwm.c +++ b/arch/ppc/mpc55xx/drivers/Pwm.c @@ -21,8 +21,9 @@ #include "Pwm.h" #include "MemMap.h" +#if defined(USE_DET) #include "Det.h" - +#endif #include "mpc55xx.h" #include "Os.h" diff --git a/arch/ppc/mpc55xx/drivers/PwmFlex.c b/arch/ppc/mpc55xx/drivers/PwmFlex.c index 90f62405..8373712b 100644 --- a/arch/ppc/mpc55xx/drivers/PwmFlex.c +++ b/arch/ppc/mpc55xx/drivers/PwmFlex.c @@ -30,8 +30,9 @@ So the usage of PMWA and PWMB signals is easy. The PWMX, if not use as input (fo #include "Pwm.h" #include "MemMap.h" +#if defined(USE_DET) #include "Det.h" - +#endif #include "mpc55xx.h" #include "Os.h" diff --git a/arch/ppc/mpc55xx/drivers/Spi.c b/arch/ppc/mpc55xx/drivers/Spi.c index 7bbd46e8..9831cf24 100644 --- a/arch/ppc/mpc55xx/drivers/Spi.c +++ b/arch/ppc/mpc55xx/drivers/Spi.c @@ -158,7 +158,9 @@ #if (SPI_IMPLEMENTATION==SPI_DMA) #include "Dma.h" #endif +#if defined(USE_DET) #include "Det.h" +#endif #include "isr.h" /* ----------------------------[private define]------------------------------*/ #define DSPI_CTRL_A 0 diff --git a/communication/CanIf/CanIf.c b/communication/CanIf/CanIf.c index 939fd55a..0a958565 100644 --- a/communication/CanIf/CanIf.c +++ b/communication/CanIf/CanIf.c @@ -19,8 +19,9 @@ - +#if defined(USE_DET) #include "Det.h" +#endif #include "CanIf.h" #include "Can.h" diff --git a/communication/CanNm/CanNm.c b/communication/CanNm/CanNm.c index 062e249d..1901dca3 100644 --- a/communication/CanNm/CanNm.c +++ b/communication/CanNm/CanNm.c @@ -62,8 +62,10 @@ #include #if (CANNM_DEV_ERROR_DETECT == STD_ON) +#if defined(USE_DET) #include "Det.h" /** @req CANNM082 */ #endif +#endif #if defined(USE_DEM) #include "Dem.h" /** @req CANNM082 */ #endif diff --git a/communication/CanSM/CanSM.c b/communication/CanSM/CanSM.c index ab144b8d..66cd84b1 100644 --- a/communication/CanSM/CanSM.c +++ b/communication/CanSM/CanSM.c @@ -29,7 +29,9 @@ #include "Com.h" /**< @req CANSM172 */ #include "ComM.h" /**< @req CANSM174 */ #include "ComM_BusSm.h" /**< @req CANSM191 */ +#if defined(USE_DET) #include "Det.h" /**< @req CANSM015 */ +#endif #if defined(USE_DEM) #include "Dem.h" /**< @req CANSM014 */ #endif diff --git a/communication/CanTp/CanTp.c b/communication/CanTp/CanTp.c index 6e58c7f3..42d05fec 100644 --- a/communication/CanTp/CanTp.c +++ b/communication/CanTp/CanTp.c @@ -47,7 +47,9 @@ #include "CanTp.h" /** @req CANTP219 */ #include "CanTp_Cbk.h" /** @req CANTP233 */ +#if defined(USE_DET) #include "Det.h" +#endif #include "CanIf.h" #include "SchM_CanTp.h" #include "PduR_CanTp.h" diff --git a/communication/Com/Com_Com.c b/communication/Com/Com_Com.c index 1f2fe3a1..aaa145eb 100644 --- a/communication/Com/Com_Com.c +++ b/communication/Com/Com_Com.c @@ -28,7 +28,9 @@ #include "Com_misc.h" #include "debug.h" #include "PduR.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Cpu.h" Com_BufferPduStateType Com_BufferPduState[COM_N_IPDUS]; diff --git a/communication/Com/Com_Internal.h b/communication/Com/Com_Internal.h index d9c00d1b..fa3efaa1 100644 --- a/communication/Com/Com_Internal.h +++ b/communication/Com/Com_Internal.h @@ -36,7 +36,9 @@ extern Com_Arc_Config_type Com_Arc_Config; #if COM_DEV_ERROR_DETECT == STD_ON +#if defined(USE_DET) #include "Det.h" +#endif #define DET_REPORTERROR(_x,_y,_z,_q) Det_ReportError(_x,_y,_z,_q) diff --git a/communication/ComM/ComM.c b/communication/ComM/ComM.c index a0896233..403a710c 100644 --- a/communication/ComM/ComM.c +++ b/communication/ComM/ComM.c @@ -42,8 +42,10 @@ #include "ComM_Dcm.h" #include "ComM_EcuM.h" #if (COMM_DEV_ERROR_DETECT == STD_ON) +#if defined(USE_DET) #include "Det.h" #endif +#endif /** @req COMM507 @req COMM508 */ #if defined(USE_DEM) diff --git a/communication/Lin/LinIf.c b/communication/Lin/LinIf.c index 3dd1717d..58169074 100644 --- a/communication/Lin/LinIf.c +++ b/communication/Lin/LinIf.c @@ -30,7 +30,9 @@ #if defined(USE_PDUR) #include "PduR_LinIf.h" #endif +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/communication/Lin/LinSM.c b/communication/Lin/LinSM.c index 8124f087..8173a364 100644 --- a/communication/Lin/LinSM.c +++ b/communication/Lin/LinSM.c @@ -34,7 +34,9 @@ #include "ComStack_Types.h" #include "Com_Types.h" #include "ComM_BusSm.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Mcu.h" #include #include diff --git a/communication/PduR/PduR.c b/communication/PduR/PduR.c index ab5d13b8..b308b925 100644 --- a/communication/PduR/PduR.c +++ b/communication/PduR/PduR.c @@ -23,9 +23,9 @@ #include #include - - +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/communication/PduR/PduR_CanTp.c b/communication/PduR/PduR_CanTp.c index a1ad7edb..1278b1c3 100644 --- a/communication/PduR/PduR_CanTp.c +++ b/communication/PduR/PduR_CanTp.c @@ -15,7 +15,9 @@ #include "PduR.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "debug.h" #if (PDUR_ZERO_COST_OPERATION == STD_OFF) && (PDUR_CANTP_SUPPORT == STD_ON) diff --git a/communication/PduR/PduR_J1939Tp.c b/communication/PduR/PduR_J1939Tp.c index 168373c4..32032a12 100644 --- a/communication/PduR/PduR_J1939Tp.c +++ b/communication/PduR/PduR_J1939Tp.c @@ -15,7 +15,9 @@ #include "PduR.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "debug.h" #if (PDUR_ZERO_COST_OPERATION == STD_OFF) && (PDUR_J1939TP_SUPPORT == STD_ON) diff --git a/communication/PduR/PduR_Logic.c b/communication/PduR/PduR_Logic.c index d21e5109..26d5247d 100644 --- a/communication/PduR/PduR_Logic.c +++ b/communication/PduR/PduR_Logic.c @@ -25,7 +25,9 @@ #include #include "debug.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/communication/PduR/PduR_SoAd.c b/communication/PduR/PduR_SoAd.c index bd3c4d19..fbffe9b0 100644 --- a/communication/PduR/PduR_SoAd.c +++ b/communication/PduR/PduR_SoAd.c @@ -15,9 +15,9 @@ #include "PduR.h" - - +#if defined(USE_DET) #include "Det.h" +#endif #include "debug.h" #if (PDUR_ZERO_COST_OPERATION == STD_OFF) && (PDUR_SOAD_SUPPORT == STD_ON) diff --git a/diagnostic/Dcm/Dcm_Internal.h b/diagnostic/Dcm/Dcm_Internal.h index 27c91a1e..548966e8 100644 --- a/diagnostic/Dcm/Dcm_Internal.h +++ b/diagnostic/Dcm/Dcm_Internal.h @@ -24,7 +24,9 @@ #if ( DCM_DEV_ERROR_DETECT == STD_ON ) +#if defined(USE_DET) #include "Det.h" +#endif #define VALIDATE(_exp,_api,_err ) \ if( !(_exp) ) { \ Det_ReportError(MODULE_ID_DCM, 0, _api, _err); \ diff --git a/diagnostic/Dem/Dem.c b/diagnostic/Dem/Dem.c index 634e39d6..d037e89a 100644 --- a/diagnostic/Dem/Dem.c +++ b/diagnostic/Dem/Dem.c @@ -66,7 +66,9 @@ #define DEBOUNCE_FDC_TEST_PASSED -128 #if ( DEM_DEV_ERROR_DETECT == STD_ON ) +#if defined(USE_DET) #include "Det.h" +#endif /** @req DEM117 */ #define VALIDATE_RV(_exp,_api,_err,_rv ) \ if( !(_exp) ) { \ diff --git a/diagnostic/Det/Det.c b/diagnostic/Det/Det.c index 6b39b3c0..ddefb9c4 100644 --- a/diagnostic/Det/Det.c +++ b/diagnostic/Det/Det.c @@ -28,7 +28,9 @@ #include "Std_Types.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Cpu.h" #include "MemMap.h" /** @req DET006 */ diff --git a/drivers/Adc_Internal.c b/drivers/Adc_Internal.c index 5ecf7690..f047038e 100644 --- a/drivers/Adc_Internal.c +++ b/drivers/Adc_Internal.c @@ -15,7 +15,9 @@ #include "Modules.h" #include "Adc.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Os.h" #include "arc.h" #include "Adc_Internal.h" diff --git a/drivers/Fls_SST25xx.c b/drivers/Fls_SST25xx.c index 924d2be3..91216d8a 100644 --- a/drivers/Fls_SST25xx.c +++ b/drivers/Fls_SST25xx.c @@ -53,7 +53,9 @@ #include "Fls.h" #include "Fls_SST25xx.h" #include "Spi.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/include/CanIf.h b/include/CanIf.h index 9d108638..7bbf9ec5 100644 --- a/include/CanIf.h +++ b/include/CanIf.h @@ -35,7 +35,9 @@ #define CANIF_SW_MINOR_VERSION 3 #define CANIF_SW_PATCH_VERSION 0 +#if defined(USE_DET) #include "Det.h" +#endif #include "CanIf_Types.h" #include "CanIf_SpecialPdus.h" #include "CanIf_Cfg.h" diff --git a/include/Fls.h b/include/Fls.h index 740bd40a..b758cd1b 100644 --- a/include/Fls.h +++ b/include/Fls.h @@ -26,7 +26,9 @@ // Only if external flash device //#include "Spi.h" #include "Std_Types.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "MemIf_Types.h" #if defined(USE_DEM) #include "Dem.h" diff --git a/include/Fls_SST25xx.h b/include/Fls_SST25xx.h index ec269c3e..3718ac7f 100644 --- a/include/Fls_SST25xx.h +++ b/include/Fls_SST25xx.h @@ -28,7 +28,9 @@ // Only if external flash device //#include "Spi.h" #include "Std_Types.h" +#if defined(USE_DET) #include "Det.h" +#endif #include "Fls.h" // SW ans Autosar spec versions diff --git a/include/PduR_If.h b/include/PduR_If.h index b7a641c8..30266458 100644 --- a/include/PduR_If.h +++ b/include/PduR_If.h @@ -20,7 +20,9 @@ #define PDUR_IF_H_ #include "PduR.h" +#if defined(USE_DET) #include "Det.h" +#endif #if PDUR_ZERO_COST_OPERATION == STD_OFF diff --git a/memory/Ea/Ea.c b/memory/Ea/Ea.c index 0500b5a5..a639f662 100644 --- a/memory/Ea/Ea.c +++ b/memory/Ea/Ea.c @@ -29,8 +29,10 @@ /** @req EA011 */ /** @req EA045 */ #if (STD_ON == EA_DEV_ERROR_DETECT) +#if defined(USE_DET) #include "Det.h" #endif +#endif diff --git a/memory/Fee/Fee.c b/memory/Fee/Fee.c index 6ee92166..861a47ea 100644 --- a/memory/Fee/Fee.c +++ b/memory/Fee/Fee.c @@ -93,7 +93,9 @@ * Validation macros */ #if ( FEE_DEV_ERROR_DETECT == STD_ON ) +#if defined(USE_DET) #include "Det.h" +#endif #define DET_VALIDATE(_exp,_api,_err ) \ if( !(_exp) ) { \ Det_ReportError(MODULE_ID_FEE, 0, _api, _err); \ diff --git a/memory/NvM/NvM.c b/memory/NvM/NvM.c index 2b9d47cf..02d4f665 100644 --- a/memory/NvM/NvM.c +++ b/memory/NvM/NvM.c @@ -302,7 +302,9 @@ #endif #if ( NVM_DEV_ERROR_DETECT == STD_ON ) +#if defined(USE_DET) #include "Det.h" +#endif #define DET_VALIDATE(_exp,_api,_err ) \ if( !(_exp) ) { \ Det_ReportError(MODULE_ID_NVM, 0, _api, _err); \ diff --git a/system/EcuM/EcuM_Callout_Stubs.c b/system/EcuM/EcuM_Callout_Stubs.c index 5356f576..22ed9c12 100644 --- a/system/EcuM/EcuM_Callout_Stubs.c +++ b/system/EcuM/EcuM_Callout_Stubs.c @@ -15,7 +15,9 @@ #include "EcuM.h" #include "EcuM_Generated_Types.h" +#if defined(USE_DET) #include "Det.h" +#endif #if defined(USE_DEM) #include "Dem.h" #endif diff --git a/system/EcuM/EcuM_Internals.h b/system/EcuM/EcuM_Internals.h index f04e6d5a..34507b64 100644 --- a/system/EcuM/EcuM_Internals.h +++ b/system/EcuM/EcuM_Internals.h @@ -26,7 +26,9 @@ #define _ECUM_INTERNALS_H_ #if ( ECUM_DEV_ERROR_DETECT == STD_ON ) +#if defined(USE_DET) #include "Det.h" +#endif #define VALIDATE(_exp,_api,_err ) \ if( !(_exp) ) { \ Det_ReportError(MODULE_ID_ECUM, 0, _api, _err); \ diff --git a/system/WdgIf/WdgIf.c b/system/WdgIf/WdgIf.c index 017fe825..9f8bbf4d 100644 --- a/system/WdgIf/WdgIf.c +++ b/system/WdgIf/WdgIf.c @@ -22,7 +22,9 @@ //lint -emacro(904,VALIDATE,VALIDATE_NO_RETURNVAL) #include "WdgIf.h" +#if defined(USE_DET) #include "Det.h" +#endif #define VALIDATE(_expr, _api, _errorcode) \ if(!_expr) { \ diff --git a/system/WdgM/WdgM.c b/system/WdgM/WdgM.c index ac2e8ebd..1fcad654 100644 --- a/system/WdgM/WdgM.c +++ b/system/WdgM/WdgM.c @@ -20,7 +20,9 @@ #include "WdgM.h" #include "WdgIf.h" +#if defined(USE_DET) #include "Det.h" +#endif #if (WDGM_DEV_ERROR_DETECT == STD_ON) #define WDGM_REPORT_ERROR(_api,_errorcode) \ -- 2.39.2