]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Re-added generic callout stubs file for Dcm (with make rule). arc_diag_integration
authorjohn <devnull@localhost>
Wed, 12 Sep 2012 12:08:42 +0000 (14:08 +0200)
committerjohn <devnull@localhost>
Wed, 12 Sep 2012 12:08:42 +0000 (14:08 +0200)
boards/board_common.mk
boards/generic/Dcm_Callout_Stubs.c

index 8a10973f7cbf39ed4c08d99ccff295247c72759d..eac469a444a8b94dbf44737a276913dbc810746c 100644 (file)
@@ -267,7 +267,10 @@ obj-$(USE_DCM) += Dcm_Dsp.o
 obj-$(USE_DCM) += Dcm_Dsd.o\r
 obj-$(USE_DCM) += Dcm_Dsl.o\r
 obj-$(USE_DCM) += Dcm_LCfg.o\r
+ifeq ($(filter Dcm_Callout_Stubs.o,$(obj-y)),)\r
 obj-$(USE_DCM) += Dcm_Callout_Stubs.o\r
+endif\r
+\r
 inc-$(USE_DCM) += $(ROOTDIR)/diagnostic/Dcm\r
 vpath-$(USE_DCM) += $(ROOTDIR)/diagnostic/Dcm\r
 \r
index 3c55a457eada3e4f0b2ec44650b720b765dfaf9d..9c9c1669b2eedf018c613832644000b028952248 100644 (file)
@@ -16,7 +16,6 @@
 /* Ecum Callout Stubs - generic version */\r
 \r
 #include "Dem.h"\r
-#if 0\r
 Dcm_ReturnWriteMemoryType Dcm_WriteMemory(Dcm_OpStatusType OpStatus,\r
                                                                                           uint8 MemoryIdentifier,\r
                                                                                           uint32 MemoryAddress,\r
@@ -38,4 +37,3 @@ Dcm_ReturnReadMemoryType Dcm_ReadMemory(Dcm_OpStatusType OpStatus,
 \r
        return DCM_READ_FAILED;\r
 }\r
-#endif\r