Dem, Changed types to match tool output.

diff --git a/diagnostic/Dcm/Dcm_Dsp.c b/diagnostic/Dcm/Dcm_Dsp.c
index f36bb888dae1430077f5a696c4cbe195ba4f4575..c852abf47761dc5a215446a78eb4a1bc2a103649 100644 (file)
--- a/diagnostic/Dcm/Dcm_Dsp.c
+++ b/diagnostic/Dcm/Dcm_Dsp.c
@@ -734,7 +734,7 @@ static Dcm_NegativeResponseCodeType udsReadDtcInfoSub_0x04(const PduInfoType *pd
                        for (index = 0; pEventParaTemp->FreezeFrameClassRef[index] != NULL; index++){\r
                                if (pEventParaTemp->FreezeFrameClassRef[index]->FFRecordNumber == RecordNumber) {\r
                                        // Calculate the Number of Dids in FF\r
-                                       for (FFIdNumber = 0; pEventParaTemp->FreezeFrameClassRef[index]->FFIdClassRef[FFIdNumber].Arc_EOL != FALSE; FFIdNumber++) {\r
+                                       for (FFIdNumber = 0; pEventParaTemp->FreezeFrameClassRef[index]->FFIdClassRef[FFIdNumber]->Arc_EOL != FALSE; FFIdNumber++) {\r
                                                ;\r
                                        }\r
                                }\r

diff --git a/diagnostic/Dem/Dem.c b/diagnostic/Dem/Dem.c
index 11d7309824b7b02cc5d5335f811df55014be356d..af82bdcca6141758bab45e7e4807f4f78fb0d169 100644 (file)
--- a/diagnostic/Dem/Dem.c
+++ b/diagnostic/Dem/Dem.c
@@ -937,19 +937,22 @@ static void getFreezeFrameData(const Dem_EventParameterType *eventParam,
        }\r
 \r
        /* Find out the corresponding FF class */\r
-       for(i = 0;(i<DEM_MAX_NR_OF_CLASSES_IN_FREEZEFRAME_DATA) && (eventParam->FreezeFrameClassRef[i] != NULL);i++){\r
-               if(eventParam->FreezeFrameClassRef[i]->FFStorageCondition == prefailedOrFailed){\r
-                       FreezeFrameLocal = eventParam->FreezeFrameClassRef[i];\r
-                       break;\r
+       if( eventParam->FreezeFrameClassRef != NULL ) {\r
+               for(i = 0;(i<DEM_MAX_NR_OF_CLASSES_IN_FREEZEFRAME_DATA) && (eventParam->FreezeFrameClassRef[i] != NULL);i++){\r
+                       if(eventParam->FreezeFrameClassRef[i]->FFStorageCondition == prefailedOrFailed){\r
+                               FreezeFrameLocal = eventParam->FreezeFrameClassRef[i];\r
+                               break;\r
+                       }\r
                }\r
        }\r
+\r
        /* get the dids */\r
        if(FreezeFrameLocal != NULL){\r
                if(FreezeFrameLocal->FFIdClassRef != NULL){\r
-                       for (i = 0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && (!(FreezeFrameLocal->FFIdClassRef[i].Arc_EOL)); i++) {\r
-                               if(FreezeFrameLocal->FFIdClassRef[i].PidOrDidUsePort == FALSE){\r
-                                       if(FreezeFrameLocal->FFIdClassRef[i].DidReadDataLengthFnc != NULL){\r
-                                               callbackReturnCode = FreezeFrameLocal->FFIdClassRef[i].DidReadDataLengthFnc(&recordSize);\r
+                       for (i = 0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && (!(FreezeFrameLocal->FFIdClassRef[i]->Arc_EOL)); i++) {\r
+                               if(FreezeFrameLocal->FFIdClassRef[i]->PidOrDidUsePort == FALSE){\r
+                                       if(FreezeFrameLocal->FFIdClassRef[i]->DidReadDataLengthFnc != NULL){\r
+                                               callbackReturnCode = FreezeFrameLocal->FFIdClassRef[i]->DidReadDataLengthFnc(&recordSize);\r
                                                if(callbackReturnCode != E_OK){\r
                                                        //if fail to read data length,discard the storage of FF\r
                                                        freezeFrame->eventId = DEM_EVENT_ID_NULL;\r
@@ -959,21 +962,21 @@ static void getFreezeFrameData(const Dem_EventParameterType *eventParam,
                                        }\r
                                        /* if no readDidDataLengthFunction, then try the PidOrDidSize. */\r
                                        else{\r
-                                               recordSize = FreezeFrameLocal->FFIdClassRef[i].PidOrDidSize;\r
+                                               recordSize = FreezeFrameLocal->FFIdClassRef[i]->PidOrDidSize;\r
                                        }\r
                                        /* read out the did data */\r
                                        if ((storeIndex + recordSize + DEM_DID_IDENTIFIER_SIZE_OF_BYTES) <= DEM_MAX_SIZE_FF_DATA) {\r
                                                /* store DID */\r
-                                               freezeFrame->data[storeIndex] = (FreezeFrameLocal->FFIdClassRef[i].DidIdentifier>> 8) & 0xFFu;\r
+                                               freezeFrame->data[storeIndex] = (FreezeFrameLocal->FFIdClassRef[i]->DidIdentifier>> 8) & 0xFFu;\r
                                                storeIndex++;\r
-                                               freezeFrame->data[storeIndex] = FreezeFrameLocal->FFIdClassRef[i].DidIdentifier & 0xFFu;\r
+                                               freezeFrame->data[storeIndex] = FreezeFrameLocal->FFIdClassRef[i]->DidIdentifier & 0xFFu;\r
                                                storeIndex++;\r
                                                /* store data */\r
-                                               if(FreezeFrameLocal->FFIdClassRef[i].DidConditionCheckReadFnc != NULL){\r
-                                                       callbackReturnCode = FreezeFrameLocal->FFIdClassRef[i].DidConditionCheckReadFnc(&errorCode);\r
+                                               if(FreezeFrameLocal->FFIdClassRef[i]->DidConditionCheckReadFnc != NULL){\r
+                                                       callbackReturnCode = FreezeFrameLocal->FFIdClassRef[i]->DidConditionCheckReadFnc(&errorCode);\r
                                                        if ((callbackReturnCode == E_OK) && (errorCode == DCM_E_POSITIVERESPONSE)) {\r
-                                                               if(FreezeFrameLocal->FFIdClassRef[i].DidReadFnc!= NULL){\r
-                                                                       callbackReturnCode = FreezeFrameLocal->FFIdClassRef[i].DidReadFnc(&freezeFrame->data[storeIndex]);\r
+                                                               if(FreezeFrameLocal->FFIdClassRef[i]->DidReadFnc!= NULL){\r
+                                                                       callbackReturnCode = FreezeFrameLocal->FFIdClassRef[i]->DidReadFnc(&freezeFrame->data[storeIndex]);\r
                                                                        if (callbackReturnCode != E_OK) {\r
                                                                                memset(&freezeFrame->data[storeIndex], DEM_FREEZEFRAME_DEFAULT_VALUE, recordSize);\r
                                                                        }\r
@@ -1707,15 +1710,15 @@ static boolean lookupFreezeFrameDataSize(uint8 recordNumber, Dem_FreezeFrameClas
        uint16 i;\r
 \r
        if (*freezeFrameClassPtr != NULL) {\r
-               for (i = 0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && ((*freezeFrameClassPtr)->FFIdClassRef[i].Arc_EOL != TRUE); i++) {\r
-                       if((*freezeFrameClassPtr)->FFIdClassRef[i].DidReadDataLengthFnc != NULL){\r
-                               callbackReturnCode = (*freezeFrameClassPtr)->FFIdClassRef[i].DidReadDataLengthFnc(&dataSizeLocal);\r
+               for (i = 0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && ((*freezeFrameClassPtr)->FFIdClassRef[i]->Arc_EOL != TRUE); i++) {\r
+                       if((*freezeFrameClassPtr)->FFIdClassRef[i]->DidReadDataLengthFnc != NULL){\r
+                               callbackReturnCode = (*freezeFrameClassPtr)->FFIdClassRef[i]->DidReadDataLengthFnc(&dataSizeLocal);\r
                                if(callbackReturnCode != E_OK){\r
                                        return (dataSizeFound = FALSE);\r
                                }\r
                        }\r
                        else{\r
-                               dataSizeLocal = (*freezeFrameClassPtr)->FFIdClassRef[i].PidOrDidSize;\r
+                               dataSizeLocal = (*freezeFrameClassPtr)->FFIdClassRef[i]->PidOrDidSize;\r
                        }\r
 \r
                        *dataSize += dataSizeLocal + DEM_DID_IDENTIFIER_SIZE_OF_BYTES;\r
@@ -3224,8 +3227,8 @@ Dem_GetFreezeFameDataIdentifierByDTCType Dem_GetFreezeFrameDataIdentifierByDTC(u
                                if (checkDtcOrigin(dtcOrigin, eventRec->eventParamRef)) {\r
                                        if (lookupFreezeFrameDataRecNumParam(recordNumber, eventRec->eventParamRef, &FFDataRecordClass)) {\r
                                                if(FFDataRecordClass->FFIdClassRef != NULL){\r
-                                                       for(i=0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && (!(FFDataRecordClass->FFIdClassRef[i].Arc_EOL)); i++){\r
-                                                               dataId[didNum] = &FFDataRecordClass->FFIdClassRef[i].DidIdentifier;/** @req DEM073 */\r
+                                                       for(i=0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && (!(FFDataRecordClass->FFIdClassRef[i]->Arc_EOL)); i++){\r
+                                                               dataId[didNum] = &FFDataRecordClass->FFIdClassRef[i]->DidIdentifier;/** @req DEM073 */\r
                                                                didNum++;\r
                                                                returnCode = DEM_GET_ID_OK;\r
 \r
@@ -3282,16 +3285,16 @@ Dem_ReturnGetSizeOfFreezeFrameType Dem_GetSizeOfFreezeFrame(uint32  dtc,Dem_DTCK
                                        if (lookupFreezeFrameDataRecNumParam(recordNumber, eventRec->eventParamRef, &FFDataRecordClass)) {\r
                                                if(FFDataRecordClass->FFIdClassRef != NULL){\r
                                                        /* Note - there is a function called lookupFreezeFrameDataSize that can be used here */\r
-                                                       for(i = 0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && (!(FFDataRecordClass->FFIdClassRef[i].Arc_EOL)); i++){\r
+                                                       for(i = 0; (i < DEM_MAX_NR_OF_RECORDS_IN_FREEZEFRAME_DATA) && (!(FFDataRecordClass->FFIdClassRef[i]->Arc_EOL)); i++){\r
                                                                /* read out the did size */\r
-                                                               if(FFDataRecordClass->FFIdClassRef[i].DidReadDataLengthFnc != NULL){\r
-                                                                       callbackReturnCode = FFDataRecordClass->FFIdClassRef[i].DidReadDataLengthFnc(&dataSize);\r
+                                                               if(FFDataRecordClass->FFIdClassRef[i]->DidReadDataLengthFnc != NULL){\r
+                                                                       callbackReturnCode = FFDataRecordClass->FFIdClassRef[i]->DidReadDataLengthFnc(&dataSize);\r
                                                                        if(callbackReturnCode != E_OK){\r
                                                                                return (returnCode = DEM_GET_SIZEOFFF_PENDING);\r
                                                                        }\r
                                                                }\r
                                                                else{\r
-                                                                       dataSize = FFDataRecordClass->FFIdClassRef[i].PidOrDidSize;\r
+                                                                       dataSize = FFDataRecordClass->FFIdClassRef[i]->PidOrDidSize;\r
                                                                }\r
                                                                *sizeOfFreezeFrame += dataSize+DEM_DID_IDENTIFIER_SIZE_OF_BYTES;/** @req DEM074 */\r
                                                                returnCode = DEM_GET_SIZEOFFF_OK;\r

diff --git a/include/Dem_Lcfg.h b/include/Dem_Lcfg.h
index 2a0205fe44df2f72bfc006165098314e45e8f302..66940833fb03c3223a2c6cf1b93dd181b2226e1d 100644 (file)
--- a/include/Dem_Lcfg.h
+++ b/include/Dem_Lcfg.h
@@ -120,7 +120,7 @@ typedef struct {
        Dem_FreezeFrameKindType FFKind;                 // (1)\r
        uint8                                   FFRecordNumber; // (1)/** @req DEM040 */\r
        Dem_FreezeFrameStorageConditonType FFStorageCondition;/** @req Dem001_private */\r
-       const Dem_PidOrDidType  *FFIdClassRef;  // (1..255)/** @req DEM039 */\r
+       const Dem_PidOrDidType  **FFIdClassRef;         // (1..255)/** @req DEM039 */\r
 } Dem_FreezeFrameClassType; /** @req DEM136 */\r
 \r
 \r
@@ -235,7 +235,7 @@ typedef struct {
        Dem_EventKindType                                                       EventKind;                                      // (1)\r
        const Dem_EventClassType                                        *EventClass;                            // (1)\r
        const Dem_ExtendedDataClassType                         *ExtendedDataClassRef;          // (0..1)\r
-       const Dem_FreezeFrameClassType                          *FreezeFrameClassRef[DEM_MAX_NR_OF_CLASSES_IN_FREEZEFRAME_DATA+1];              // (0..255) (Only 0..1 supported)/** @req DEM021 */\r
+       const Dem_FreezeFrameClassType                          **FreezeFrameClassRef; //[DEM_MAX_NR_OF_CLASSES_IN_FREEZEFRAME_DATA+1];         // (0..255) (Only 0..1 supported)/** @req DEM021 */\r
        const Dem_CallbackInitMforEType                         *CallbackInitMforE;                     // (0..1)\r
        const Dem_CallbackEventStatusChangedType        *CallbackEventStatusChanged;// (0..*)\r
        const Dem_DTCClassType                                          *DTCClassRef;                           // (0..1)\r