Revert commit mistake.

diff --git a/diagnostic/Dcm/Dcm_Dsp.c b/diagnostic/Dcm/Dcm_Dsp.c
index f9ca0a6709596bead2061cc669357a3fb64e37fb..9eb18ba862d0e27f031fd87ce8f595f0f2422a6a 100644 (file)
--- a/diagnostic/Dcm/Dcm_Dsp.c
+++ b/diagnostic/Dcm/Dcm_Dsp.c
@@ -2198,9 +2198,7 @@ static Dcm_NegativeResponseCodeType DspSavePeriodicData(uint16 didNr, uint32 per
        if(responseCode == DCM_E_POSITIVERESPONSE)\r
        {\r
                dspPDidRef.dspPDid[PdidBufferNr].PeriodicDid = (uint8)didNr & DCM_DID_LOW_MASK;\r
        if(responseCode == DCM_E_POSITIVERESPONSE)\r
        {\r
                dspPDidRef.dspPDid[PdidBufferNr].PeriodicDid = (uint8)didNr & DCM_DID_LOW_MASK;\r

-                       /* REVIEW JB 2012-06-05: Why is TxCounter set to PdidBufferNr - it seems wrong. */\r
-               dspPDidRef.dspPDid[PdidBufferNr].PDidTxCounter = PdidBufferNr*3;\r
-\r
+               dspPDidRef.dspPDid[PdidBufferNr].PDidTxCounter = 0;\r

                dspPDidRef.dspPDid[PdidBufferNr].PDidTxCounterNumber = periodicTransmitCounter;\r
        }\r
        return responseCode;\r
                dspPDidRef.dspPDid[PdidBufferNr].PDidTxCounterNumber = periodicTransmitCounter;\r
        }\r
        return responseCode;\r

diff --git a/diagnostic/Dem/Dem.c b/diagnostic/Dem/Dem.c
index 5802f5b0e606c69172f61ae5e0d3137911c3878b..6bdb1a9e5f942b3beb49c7c1009468b45438a416 100644 (file)
--- a/diagnostic/Dem/Dem.c
+++ b/diagnostic/Dem/Dem.c
@@ -2368,8 +2368,6 @@ void Dem_Init(void)
                        }\r
                }\r
 \r
                        }\r
                }\r
 \r

-               //initialize the current timestamp and update the timestamp in pre init\r
-               //initCurrentFreezeFrameTimeStamp(&FF_TimeStamp);\r

 \r
                // Validate extended data records stored in primary memory\r
                for (i = 0; i < DEM_MAX_NUMBER_EXT_DATA_PRI_MEM; i++) {\r
 \r
                // Validate extended data records stored in primary memory\r
                for (i = 0; i < DEM_MAX_NUMBER_EXT_DATA_PRI_MEM; i++) {\r


@@ -3327,7 +3325,7 @@ Dem_ReturnGetSizeOfFreezeFrameType Dem_GetSizeOfFreezeFrame(uint32  dtc,Dem_DTCK
 \r
 }\r
 \r
 \r
 }\r
 \r

-\r
+#define DEM_UNIT_TEST\r

 #ifdef DEM_UNIT_TEST\r
 void getFFDataPreInit(FreezeFrameRecType **buf)\r
 {\r
 #ifdef DEM_UNIT_TEST\r
 void getFFDataPreInit(FreezeFrameRecType **buf)\r
 {\r


@@ -3365,34 +3363,3 @@ void getPriMemAgingBufPtr(HealingRecType **buf)
 /***********************************\r
  * OBD-specific Interfaces (8.3.6) *\r
  ***********************************/\r
 /***********************************\r
  * OBD-specific Interfaces (8.3.6) *\r
  ***********************************/\r

-#define DEM_UNIT_TEST\r
-#ifdef DEM_UNIT_TEST\r
-void getFFDataPreInit(FreezeFrameRecType **buf)\r
-{\r
-       *buf = &preInitFreezeFrameBuffer[0];\r
-       return;\r
-}\r
-void getPriMemFFBufPtr(FreezeFrameRecType **buf)\r
-{\r
-       *buf = &priMemFreezeFrameBuffer[0];\r
-       return;\r
-}\r
-\r
-uint32 getCurTimeStamp()\r
-{\r
-       return FF_TimeStamp;\r
-}\r
-\r
-void getPriMemEventRecBufPtr(EventStatusRecType **buf)\r
-{\r
-       *buf = &eventStatusBuffer[0];\r
-       return;\r
-}\r
-\r
-void getPriMemAgingBufPtr(HealingRecType **buf)\r
-{\r
-       *buf = &priMemAgingBuffer[0];\r
-       return;\r
-}\r
-#endif\r
-\r