Started fixing lint errors on DEM module

diff --git a/communication/CanIf/CanIf.c b/communication/CanIf/CanIf.c
index 74ff8de573b9c9eb65704769027fd546895fc1ff..8397b4ed4e7e2faa14e1696c872f117ae7fa3bad 100644 (file)
--- a/communication/CanIf/CanIf.c
+++ b/communication/CanIf/CanIf.c
@@ -295,6 +295,7 @@ Std_ReturnType CanIf_SetControllerMode(uint8 Controller,
     if (Can_SetControllerMode(canControllerId, CAN_T_STOP) == CAN_NOT_OK)\r
       return E_NOT_OK;\r
     CanIf_Global.channelData[channel].ControllerMode = CANIF_CS_STOPPED;\r
+    break;\r
   }\r
 \r
   case CANIF_CS_UNINIT:\r

diff --git a/diagnostic/Dcm/Dcm_Dsd.c b/diagnostic/Dcm/Dcm_Dsd.c
index 61c0060a7f4ecda04615bb8ed5dd5fb638898a1e..44a456e1e3c9d3ee3c35536e3c14a83d88c746f6 100644 (file)
--- a/diagnostic/Dcm/Dcm_Dsd.c
+++ b/diagnostic/Dcm/Dcm_Dsd.c
@@ -56,8 +56,9 @@ static boolean askApplicationForServicePermission(uint8 *requestData, uint16 dat
        while (!serviceRequestIndication->Arc_EOL && (returnCode != E_REQUEST_NOT_ACCEPTED)) {\r
                if (serviceRequestIndication->Indication != NULL) {\r
                        result = serviceRequestIndication->Indication(requestData, dataSize);\r
-                       if (result != E_OK)\r
+                       if (result != E_OK){\r
                                returnCode = result;\r
+                       }\r
                }\r
                serviceRequestIndication++;\r
        }\r

diff --git a/diagnostic/Dcm/Dcm_Dsp.c b/diagnostic/Dcm/Dcm_Dsp.c
index e4ea1ae246d7d1f77fbef363d1e3a321ac8c9ff8..23aef923f4963bf5a84113a45e211b7484c6b46a 100644 (file)
--- a/diagnostic/Dcm/Dcm_Dsp.c
+++ b/diagnostic/Dcm/Dcm_Dsp.c
@@ -460,7 +460,7 @@ static Dcm_NegativeResponseCodeType udsReadDtcInfoSub_0x06_0x10(const PduInfoTyp
                if (getStatusOfDtcResult == DEM_STATUS_OK) {\r
                        Dem_ReturnGetExtendedDataRecordByDTCType getExtendedDataRecordByDtcResult;\r
                        uint16 recNum;\r
-                       uint8 recLength;\r
+                       uint16 recLength;\r
                        uint16 txIndex = 6;\r
 \r
                        /** @req DCM297 */ /** @req DCM474 */ /** @req DCM386 */\r

diff --git a/diagnostic/Dem/Dem.c b/diagnostic/Dem/Dem.c
index 32cd6c124ee0061a8a355481e8d491612703e3c1..60710d8847fc8685a49a267ff486bd0f59cfd83a 100644 (file)
--- a/diagnostic/Dem/Dem.c
+++ b/diagnostic/Dem/Dem.c
@@ -53,12 +53,6 @@
 #if  ( DEM_DEV_ERROR_DETECT == STD_ON )\r
 #include "Det.h"\r
 /** @req DEM117 */\r
-#define VALIDATE(_exp,_api,_err ) \\r
-        if( !(_exp) ) { \\r
-          Det_ReportError(MODULE_ID_DEM, 0, _api, _err); \\r
-          return E_NOT_OK; \\r
-        }\r
-\r
 #define VALIDATE_RV(_exp,_api,_err,_rv ) \\r
         if( !(_exp) ) { \\r
           Det_ReportError(MODULE_ID_DEM, 0, _api, _err); \\r
@@ -73,7 +67,6 @@
 #define DET_REPORTERROR(_x,_y,_z,_q) Det_ReportError(_x, _y, _z, _q)\r
 \r
 #else\r
-#define VALIDATE(_exp,_api,_err )\r
 #define VALIDATE_RV(_exp,_api,_err,_rv )\r
 #define VALIDATE_NO_RV(_exp,_api,_err )\r
 #define DET_REPORTERROR(_x,_y,_z,_q)\r
@@ -192,7 +185,7 @@ static ExtDataRecType               priMemExtDataBuffer[DEM_MAX_NUMBER_EXT_DATA_PRI_MEM] __at
  * Procedure:  zeroPriMemBuffers\r
  * Description:        Fill the primary buffers with zeroes\r
  */\r
-void demZeroPriMemBuffers(void)\r
+void demZeroPriMemBuffers(void) // Lint OK: Used only by DemTest\r
 {\r
        memset(priMemEventBuffer, 0, sizeof(priMemEventBuffer));\r
        memset(priMemFreezeFrameBuffer, 0, sizeof(priMemFreezeFrameBuffer));\r
@@ -210,8 +203,9 @@ static ChecksumType calcChecksum(void *data, uint16 nrOfBytes)
        uint8 *ptr = (uint8*)data;\r
        ChecksumType sum = 0;\r
 \r
-       for (i = 0; i < nrOfBytes; i++)\r
+       for (i = 0; i < nrOfBytes; i++) {\r
                sum += *ptr++;\r
+       }\r
        sum ^= 0xaaaa;\r
        return sum;\r
 }\r
@@ -315,6 +309,25 @@ static boolean checkDtcFaultDetectionCounter(const Dem_EventParameterType *event
  * Description:        Returns the pointer to event id parameters of "eventId" in "*eventStatusBuffer",\r
  *                             if not found NULL is returned.\r
  */\r
+#if 1\r
+static void lookupEventStatusRec(Dem_EventIdType eventId, EventStatusRecType **const eventStatusRec)\r
+{\r
+       EventStatusRecType *eventStatusRecPtr = eventStatusBuffer;\r
+       uint8 i;\r
+       boolean found = FALSE;\r
+\r
+       for (i = 0; (i < DEM_MAX_NUMBER_EVENT) && !found; i++) {\r
+               found = (eventStatusRecPtr->eventId != eventId);\r
+               eventStatusRecPtr++;\r
+       }\r
+\r
+       if (found) {\r
+               *eventStatusRec = eventStatusRecPtr;\r
+       } else {\r
+               *eventStatusRec = NULL;\r
+       }\r
+}\r
+#else\r
 static void lookupEventStatusRec(Dem_EventIdType eventId, EventStatusRecType **const eventStatusRec)\r
 {\r
        EventStatusRecType *eventStatusRecPtr = eventStatusBuffer;\r
@@ -329,6 +342,7 @@ static void lookupEventStatusRec(Dem_EventIdType eventId, EventStatusRecType **c
                *eventStatusRec = NULL;\r
        }\r
 }\r
+#endif\r
 \r
 \r
 /*\r
@@ -357,7 +371,7 @@ static void lookupEventIdParameter(Dem_EventIdType eventId, const Dem_EventParam
  * Procedure:  preDebounceNone\r
  * Description:        Returns the result of the debouncing.\r
  */\r
-static Dem_EventStatusType preDebounceNone(Dem_EventStatusType reportedStatus, EventStatusRecType* statusRecord) {\r
+static Dem_EventStatusType preDebounceNone(const Dem_EventStatusType reportedStatus, const EventStatusRecType* statusRecord) {// Lint klagar men OK\r
        Dem_EventStatusType returnCode;\r
 \r
        switch (reportedStatus) {\r
@@ -391,8 +405,8 @@ static Dem_EventStatusType preDebounceCounterBased(Dem_EventStatusType reportedS
                        if (pdVars->JumpUp && (statusRecord->faultDetectionCounter < 0)) {\r
                                statusRecord->faultDetectionCounter = 0;\r
                        } else {\r
-                               if (((sint16)statusRecord->faultDetectionCounter + pdVars->CountInStepSize) < DEBOUNCE_FDC_TEST_FAILED) {\r
-                                       statusRecord->faultDetectionCounter += pdVars->CountInStepSize;\r
+                               if (((sint16)statusRecord->faultDetectionCounter + (sint8)pdVars->CountInStepSize) < DEBOUNCE_FDC_TEST_FAILED) {\r
+                                       statusRecord->faultDetectionCounter += (sint8)pdVars->CountInStepSize;\r
                                } else {\r
                                        statusRecord->faultDetectionCounter = DEBOUNCE_FDC_TEST_FAILED;\r
                                }\r
@@ -405,8 +419,8 @@ static Dem_EventStatusType preDebounceCounterBased(Dem_EventStatusType reportedS
                        if (pdVars->JumpDown && (statusRecord->faultDetectionCounter > 0)) {\r
                                statusRecord->faultDetectionCounter = 0;\r
                        } else {\r
-                               if (((sint16)statusRecord->faultDetectionCounter - pdVars->CountOutStepSize) > DEBOUNCE_FDC_TEST_PASSED) {\r
-                                       statusRecord->faultDetectionCounter -= pdVars->CountOutStepSize;\r
+                               if (((sint16)statusRecord->faultDetectionCounter - (sint8)pdVars->CountOutStepSize) > DEBOUNCE_FDC_TEST_PASSED) {\r
+                                       statusRecord->faultDetectionCounter -= (sint8)pdVars->CountOutStepSize;\r
                                } else {\r
                                        statusRecord->faultDetectionCounter = DEBOUNCE_FDC_TEST_PASSED;\r
                                }\r
@@ -527,7 +541,7 @@ static void updateEventStatusRec(const Dem_EventParameterType *eventParam, Dem_E
        else {\r
                // Copy an empty record to return data\r
                eventStatusRec->eventId = DEM_EVENT_ID_NULL;\r
-               eventStatusRecPtr->faultDetectionCounter = 0;\r
+               eventStatusRec->faultDetectionCounter = 0;\r
                eventStatusRec->occurrence = 0;\r
                eventStatusRec->eventStatusExtended = DEM_TEST_NOT_COMPLETED_THIS_OPERATION_CYCLE | DEM_TEST_NOT_COMPLETED_SINCE_LAST_CLEAR;\r
                eventStatusRec->errorStatusChanged = FALSE;\r
@@ -541,7 +555,7 @@ static void updateEventStatusRec(const Dem_EventParameterType *eventParam, Dem_E
  * Procedure:  mergeEventStatusRec\r
  * Description:        Update the occurrence counter of status, if not exist a new record is created\r
  */\r
-static void mergeEventStatusRec(EventRecType *eventRec)\r
+static void mergeEventStatusRec(const EventRecType *eventRec)\r
 {\r
        EventStatusRecType *eventStatusRecPtr;\r
        imask_t state = McuE_EnterCriticalSection();\r
@@ -693,13 +707,13 @@ static void getFreezeFrameData(const Dem_EventParameterType *eventParam, FreezeF
 }\r
 \r
 \r
-static void storeFreezeFrameDataPreInit(const Dem_EventParameterType *eventParam, FreezeFrameRecType *freezeFrame)\r
+static void storeFreezeFrameDataPreInit(const Dem_EventParameterType *eventParam, const FreezeFrameRecType *freezeFrame)\r
 {\r
        // TODO: Fill out\r
 }\r
 \r
 \r
-static void updateFreezeFrameOccurrencePreInit(EventRecType *EventBuffer)\r
+static void updateFreezeFrameOccurrencePreInit(const EventRecType *EventBuffer)\r
 {\r
        // TODO: Fill out\r
 }\r
@@ -729,7 +743,7 @@ static void getExtendedData(const Dem_EventParameterType *eventParam, ExtDataRec
                                callbackReturnCode = eventParam->ExtendedDataClassRef->ExtendedDataRecordClassRef[i]->CallbackGetExtDataRecord(&extData->data[storeIndex]); /** @req DEM282 */\r
                                if (callbackReturnCode != E_OK) {\r
                                        // Callback data currently not available, clear space.\r
-                                       memset(&extData->data[storeIndex], 0xFF, recordSize);\r
+                                       memset(&extData->data[storeIndex], 0xFF, recordSize); // Lint OK\r
                                }\r
                                storeIndex += recordSize;\r
                        }\r
@@ -760,7 +774,7 @@ static void getExtendedData(const Dem_EventParameterType *eventParam, ExtDataRec
  * Description:        Store the extended data pointed by "extendedData" to the "preInitExtDataBuffer",\r
  *                             if non existent a new entry is created.\r
  */\r
-static void storeExtendedDataPreInit(const Dem_EventParameterType *eventParam, ExtDataRecType *extendedData)\r
+static void storeExtendedDataPreInit(const Dem_EventParameterType *eventParam, const ExtDataRecType *extendedData)\r
 {\r
        uint16 i;\r
        imask_t state = McuE_EnterCriticalSection();\r
@@ -794,7 +808,7 @@ static void storeExtendedDataPreInit(const Dem_EventParameterType *eventParam, E
  * Description:        Store the event data of "eventStatus->eventId" in "priMemEventBuffer",\r
  *                             if non existent a new entry is created.\r
  */\r
-static void storeEventPriMem(const Dem_EventParameterType *eventParam, EventStatusRecType *eventStatus)\r
+static void storeEventPriMem(const Dem_EventParameterType *eventParam, const EventStatusRecType *eventStatus)\r
 {\r
        uint16 i;\r
        imask_t state = McuE_EnterCriticalSection();\r
@@ -854,7 +868,7 @@ static void deleteEventPriMem(const Dem_EventParameterType *eventParam)
  * Description:        Store the event data of "eventStatus->eventId" in event memory according to\r
  *                             "eventParam" destination option.\r
  */\r
-static void storeEventEvtMem(const Dem_EventParameterType *eventParam, EventStatusRecType *eventStatus)\r
+static void storeEventEvtMem(const Dem_EventParameterType *eventParam, const EventStatusRecType *eventStatus)\r
 {\r
        uint16 i;\r
 \r
@@ -884,7 +898,7 @@ static void storeEventEvtMem(const Dem_EventParameterType *eventParam, EventStat
  * Description:        Store the extended data pointed by "extendedData" to the "priMemExtDataBuffer",\r
  *                             if non existent a new entry is created.\r
  */\r
-static void storeExtendedDataPriMem(const Dem_EventParameterType *eventParam, ExtDataRecType *extendedData) /** @req DEM041 */\r
+static void storeExtendedDataPriMem(const Dem_EventParameterType *eventParam, const ExtDataRecType *extendedData) /** @req DEM041 */\r
 {\r
        uint16 i;\r
        imask_t state = McuE_EnterCriticalSection();\r
@@ -938,7 +952,7 @@ static void deleteExtendedDataPriMem(const Dem_EventParameterType *eventParam)
  * Description:        Store the extended data in event memory according to\r
  *                             "eventParam" destination option\r
  */\r
-static void storeExtendedDataEvtMem(const Dem_EventParameterType *eventParam, ExtDataRecType *extendedData)\r
+static void storeExtendedDataEvtMem(const Dem_EventParameterType *eventParam, const ExtDataRecType *extendedData)\r
 {\r
        uint16 i;\r
 \r
@@ -968,7 +982,7 @@ static void storeExtendedDataEvtMem(const Dem_EventParameterType *eventParam, Ex
  * Description:        Returns TRUE if the requested extended data number was found among the configured records for the event.\r
  *                             "extDataRecClassPtr" returns a pointer to the record class, "posInExtData" returns the position in stored extended data.\r
  */\r
-static boolean lookupExtendedDataRecNumParam(uint8 extendedDataNumber, const Dem_EventParameterType *eventParam, Dem_ExtendedDataRecordClassType const **extDataRecClassPtr, uint8 *posInExtData)\r
+static boolean lookupExtendedDataRecNumParam(uint8 extendedDataNumber, const Dem_EventParameterType *eventParam, Dem_ExtendedDataRecordClassType const **extDataRecClassPtr, uint16 *posInExtData)\r
 {\r
        boolean recNumFound = FALSE;\r
 \r
@@ -999,8 +1013,21 @@ static boolean lookupExtendedDataRecNumParam(uint8 extendedDataNumber, const Dem
 static boolean lookupExtendedDataPriMem(Dem_EventIdType eventId, ExtDataRecType **extData)\r
 {\r
        boolean eventIdFound = FALSE;\r
-       uint16 i;\r
+       sint16 i;\r
+#if 1\r
+       // Lookup corresponding extended data\r
+       for (i = 0; (i < DEM_MAX_NUMBER_EXT_DATA_PRI_MEM) && !eventIdFound; i++) {\r
+               eventIdFound = (priMemExtDataBuffer[i].eventId != eventId);\r
+       }\r
+\r
+       if (eventIdFound) {\r
+               // Yes, return pointer\r
+               *extData = &priMemExtDataBuffer[i];\r
+       }\r
 \r
+       return eventIdFound;\r
+}\r
+#else\r
        // Lookup corresponding extended data\r
        for (i = 0; (priMemExtDataBuffer[i].eventId != eventId) && (i < DEM_MAX_NUMBER_EXT_DATA_PRI_MEM); i++);\r
 \r
@@ -1012,9 +1039,9 @@ static boolean lookupExtendedDataPriMem(Dem_EventIdType eventId, ExtDataRecType
 \r
        return eventIdFound;\r
 }\r
+#endif\r
 \r
-\r
-static void storeFreezeFrameDataPriMem(const Dem_EventParameterType *eventParam, FreezeFrameRecType *freezeFrame)\r
+static void storeFreezeFrameDataPriMem(const Dem_EventParameterType *eventParam, const FreezeFrameRecType *freezeFrame)\r
 {\r
        // TODO: Fill out\r
 }\r
@@ -1031,7 +1058,7 @@ static void deleteFreezeFrameDataPriMem(const Dem_EventParameterType *eventParam
  * Description:        Store the freeze frame data in event memory according to\r
  *                             "eventParam" destination option\r
  */\r
-static void storeFreezeFrameDataEvtMem(const Dem_EventParameterType *eventParam, FreezeFrameRecType *freezeFrame)\r
+static void storeFreezeFrameDataEvtMem(const Dem_EventParameterType *eventParam, const FreezeFrameRecType *freezeFrame)\r
 {\r
        uint16 i;\r
 \r
@@ -1392,7 +1419,7 @@ static Std_ReturnType setOperationCycleState(Dem_OperationCycleIdType operationC
 void Dem_PreInit(void)\r
 {\r
        /** @req DEM180 */\r
-       int i, j;\r
+       uint16 i, j;\r
 \r
        VALIDATE_NO_RV(DEM_Config.ConfigSet != NULL, DEM_PREINIT_ID, DEM_E_CONFIG_PTR_INVALID);\r
 \r
@@ -1419,21 +1446,23 @@ void Dem_PreInit(void)
                preInitFreezeFrameBuffer[i].eventId = DEM_EVENT_ID_NULL;\r
                preInitFreezeFrameBuffer[i].occurrence = 0;\r
                preInitFreezeFrameBuffer[i].dataSize = 0;\r
-               for (j = 0; j < DEM_MAX_SIZE_FF_DATA;j++)\r
+               for (j = 0; j < DEM_MAX_SIZE_FF_DATA;j++){\r
                        preInitFreezeFrameBuffer[i].data[j] = 0;\r
+               }\r
        }\r
 \r
        for (i = 0; i < DEM_MAX_NUMBER_EXT_DATA_PRE_INIT; i++) {\r
                preInitExtDataBuffer[i].checksum = 0;\r
                preInitExtDataBuffer[i].eventId = DEM_EVENT_ID_NULL;\r
                preInitExtDataBuffer[i].dataSize = 0;\r
-               for (j = 0; j < DEM_MAX_SIZE_EXT_DATA;j++)\r
+               for (j = 0; j < DEM_MAX_SIZE_EXT_DATA;j++){\r
                        preInitExtDataBuffer[i].data[j] = 0;\r
+               }\r
        }\r
 \r
        disableDtcStorage.storageDisabled = FALSE;\r
 \r
-       setOperationCycleState(DEM_ACTIVE, DEM_CYCLE_STATE_START); /** @req DEM047 */\r
+       (void)setOperationCycleState(DEM_ACTIVE, DEM_CYCLE_STATE_START); /** @req DEM047 */\r
 \r
        demState = DEM_PREINITIALIZED;\r
 }\r
@@ -1456,7 +1485,7 @@ void Dem_Init(void)
        // Validate event records stored in primary memory\r
        for (i = 0; i < DEM_MAX_NUMBER_EVENT_PRI_MEM; i++) {\r
                cSum = calcChecksum(&priMemEventBuffer[i], sizeof(EventRecType)-sizeof(ChecksumType));\r
-               if ((cSum != priMemEventBuffer[i].checksum) || priMemEventBuffer[i].eventId == DEM_EVENT_ID_NULL) {\r
+               if ((cSum != priMemEventBuffer[i].checksum) || (priMemEventBuffer[i].eventId == DEM_EVENT_ID_NULL)) {\r
                        // Unlegal record, clear the record\r
                        memset(&priMemEventBuffer[i], 0, sizeof(EventRecType));\r
                }\r
@@ -1472,7 +1501,7 @@ void Dem_Init(void)
        // Validate extended data records stored in primary memory\r
        for (i = 0; i < DEM_MAX_NUMBER_EXT_DATA_PRI_MEM; i++) {\r
                cSum = calcChecksum(&priMemExtDataBuffer[i], sizeof(ExtDataRecType)-sizeof(ChecksumType));\r
-               if ((cSum != priMemExtDataBuffer[i].checksum) || priMemExtDataBuffer[i].eventId == DEM_EVENT_ID_NULL) {\r
+               if ((cSum != priMemExtDataBuffer[i].checksum) || (priMemExtDataBuffer[i].eventId == DEM_EVENT_ID_NULL)) {\r
                        // Unlegal record, clear the record\r
                        memset(&priMemExtDataBuffer[i], 0, sizeof(ExtDataRecType));\r
                }\r
@@ -1538,7 +1567,7 @@ void Dem_Init(void)
  */\r
 void Dem_Shutdown(void)\r
 {\r
-       setOperationCycleState(DEM_ACTIVE, DEM_CYCLE_STATE_END); /** @req DEM047 */\r
+       (void)setOperationCycleState(DEM_ACTIVE, DEM_CYCLE_STATE_END); /** @req DEM047 */\r
 \r
        demState = DEM_UNINITIALIZED; /** @req DEM368 */\r
 }\r
@@ -1986,7 +2015,7 @@ Dem_ReturnClearDTCType Dem_ClearDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTC
                        if (eventId != DEM_EVENT_ID_NULL) {\r
                                eventParam = eventStatusBuffer[i].eventParamRef;\r
                                if (eventParam != NULL) {\r
-                                       if (DEM_CLEAR_ALL_EVENTS | (eventParam->DTCClassRef != NULL)) {\r
+                                       if (DEM_CLEAR_ALL_EVENTS || (eventParam->DTCClassRef != NULL)) {\r
                                                if (checkDtcKind(dtcKind, eventParam)) {\r
                                                        if (checkDtcGroup(dtc, eventParam)) {\r
                                                                for (j = 0; (j < DEM_MAX_NR_OF_EVENT_DESTINATION) && (eventParam->EventClass->EventDestination[j] != dtcOrigin); j++);\r
@@ -2088,13 +2117,13 @@ Dem_ReturnControlDTCStorageType Dem_EnableDTCStorage(Dem_DTCGroupType dtcGroup,
  * Procedure:  Dem_GetExtendedDataRecordByDTC\r
  * Reentrant:  No\r
  */\r
-Dem_ReturnGetExtendedDataRecordByDTCType Dem_GetExtendedDataRecordByDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, uint8 extendedDataNumber, uint8 *destBuffer, uint8 *bufSize)\r
+Dem_ReturnGetExtendedDataRecordByDTCType Dem_GetExtendedDataRecordByDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, uint8 extendedDataNumber, uint8 *destBuffer, uint16 *bufSize)\r
 {\r
        Dem_ReturnGetExtendedDataRecordByDTCType returnCode = DEM_RECORD_WRONG_DTC;\r
        EventStatusRecType *eventRec;\r
        Dem_ExtendedDataRecordClassType const *extendedDataRecordClass = NULL;\r
        ExtDataRecType *extData;\r
-       uint8 posInExtData = 0;\r
+       uint16 posInExtData = 0;\r
 \r
        if (demState == DEM_INITIALIZED) {\r
                if (lookupDtcEvent(dtc, &eventRec)) {\r
@@ -2107,7 +2136,7 @@ Dem_ReturnGetExtendedDataRecordByDTCType Dem_GetExtendedDataRecordByDTC(uint32 d
                                                        case DEM_DTC_ORIGIN_PRIMARY_MEMORY:\r
                                                                if (lookupExtendedDataPriMem(eventRec->eventId, &extData)) {\r
                                                                        // Yes all conditions met, copy the extended data record to destination buffer.\r
-                                                                       memcpy(destBuffer, &extData->data[posInExtData], extendedDataRecordClass->DataSize); /** @req DEM075 */\r
+                                                                       memcpy(destBuffer, &extData->data[posInExtData], extendedDataRecordClass->DataSize); /** @req DEM075 */ // Lint OK\r
                                                                        *bufSize = extendedDataRecordClass->DataSize;\r
                                                                        returnCode = DEM_RECORD_OK;\r
                                                                }\r
@@ -2164,7 +2193,7 @@ Dem_ReturnGetSizeOfExtendedDataRecordByDTCType Dem_GetSizeOfExtendedDataRecordBy
        Dem_ReturnGetExtendedDataRecordByDTCType returnCode = DEM_GET_SIZEOFEDRBYDTC_W_DTC;\r
        EventStatusRecType *eventRec;\r
        Dem_ExtendedDataRecordClassType const *extendedDataRecordClass = NULL;\r
-       uint8 posInExtData;\r
+       uint16 posInExtData;\r
 \r
        if (demState == DEM_INITIALIZED) {\r
                if (lookupDtcEvent(dtc, &eventRec)) {\r

diff --git a/diagnostic/Dem/Dem_Types.h b/diagnostic/Dem/Dem_Types.h
index fe1789fba68d1c6e19b0cfbd094789d7ef6e5497..30c508a0bc202eca9ff89c8124199c731d59542e 100644 (file)
--- a/diagnostic/Dem/Dem_Types.h
+++ b/diagnostic/Dem/Dem_Types.h
@@ -30,10 +30,10 @@
  * DTC storage types\r
  */\r
 typedef uint8 Dem_ReturnTypeOfDtcSupportedType;\r
-#define DEM_ISO15031_6         0x00\r
-#define DEM_ISO14229_1         0x01\r
-#define DEM_SAEJ1939_73                0x02\r
-#define DEM_ISO_11992_4                0x03\r
+#define DEM_ISO15031_6         (Dem_ReturnTypeOfDtcSupportedType)0x00\r
+#define DEM_ISO14229_1         (Dem_ReturnTypeOfDtcSupportedType)0x01\r
+#define DEM_SAEJ1939_73                (Dem_ReturnTypeOfDtcSupportedType)0x02\r
+#define DEM_ISO_11992_4                (Dem_ReturnTypeOfDtcSupportedType)0x03\r
 \r
 /*\r
  * Dem_EventIdType\r
@@ -44,42 +44,42 @@ typedef uint16 Dem_EventIdType;
  * Dem_DTCGroupType\r
  */\r
 typedef uint32 Dem_DTCGroupType;\r
-#define        DEM_DTC_GROUP_ALL_DTCS                  0xffffff\r
+#define        DEM_DTC_GROUP_ALL_DTCS                  (Dem_DTCGroupType)0xffffff\r
 \r
 /*\r
  * Dem status type\r
  */\r
-#define DEM_DTC_STATUS_MASK_ALL                        0x00\r
+#define DEM_DTC_STATUS_MASK_ALL                        (uint8)0x00\r
 \r
 \r
 /*\r
  * DemDTCKindType\r
  */\r
 typedef uint8 Dem_DTCKindType;\r
-#define        DEM_DTC_KIND_ALL_DTCS                   0x01\r
-#define        DEM_DTC_KIND_EMISSION_REL_DTCS  0x02\r
+#define        DEM_DTC_KIND_ALL_DTCS                   (Dem_DTCKindType)0x01\r
+#define        DEM_DTC_KIND_EMISSION_REL_DTCS  (Dem_DTCKindType)0x02\r
 \r
 /*\r
  * DemDTCOriginType\r
  */\r
 typedef uint8 Dem_DTCOriginType;\r
-#define        DEM_DTC_ORIGIN_SECONDARY_MEMORY 0x01\r
-#define        DEM_DTC_ORIGIN_PRIMARY_MEMORY   0x02\r
-#define        DEM_DTC_ORIGIN_PERMANENT_MEMORY 0x03\r
-#define        DEM_DTC_ORIGIN_MIRROR_MEMORY    0x04\r
+#define        DEM_DTC_ORIGIN_SECONDARY_MEMORY (Dem_DTCOriginType)0x01\r
+#define        DEM_DTC_ORIGIN_PRIMARY_MEMORY   (Dem_DTCOriginType)0x02\r
+#define        DEM_DTC_ORIGIN_PERMANENT_MEMORY (Dem_DTCOriginType)0x03\r
+#define        DEM_DTC_ORIGIN_MIRROR_MEMORY    (Dem_DTCOriginType)0x04\r
 \r
 /*\r
  * DemEventStatusExtendedType\r
  */\r
 typedef uint8 Dem_EventStatusExtendedType;\r
-#define        DEM_TEST_FAILED                                                         0x01\r
-#define        DEM_TEST_FAILED_THIS_OPERATION_CYCLE            0x02\r
-#define        DEM_PENDING_DTC                                                         0x04\r
-#define        DEM_CONFIRMED_DTC                                                       0x08\r
-#define        DEM_TEST_NOT_COMPLETED_SINCE_LAST_CLEAR         0x10\r
-#define        DEM_TEST_FAILED_SINCE_LAST_CLEAR                        0x20\r
-#define        DEM_TEST_NOT_COMPLETED_THIS_OPERATION_CYCLE 0x40\r
-#define        DEM_WARNING_INDICATOR_REQUESTED                         0x80\r
+#define        DEM_TEST_FAILED                                                         (Dem_EventStatusExtendedType)0x01\r
+#define        DEM_TEST_FAILED_THIS_OPERATION_CYCLE            (Dem_EventStatusExtendedType)0x02\r
+#define        DEM_PENDING_DTC                                                         (Dem_EventStatusExtendedType)0x04\r
+#define        DEM_CONFIRMED_DTC                                                       (Dem_EventStatusExtendedType)0x08\r
+#define        DEM_TEST_NOT_COMPLETED_SINCE_LAST_CLEAR         (Dem_EventStatusExtendedType)0x10\r
+#define        DEM_TEST_FAILED_SINCE_LAST_CLEAR                        (Dem_EventStatusExtendedType)0x20\r
+#define        DEM_TEST_NOT_COMPLETED_THIS_OPERATION_CYCLE (Dem_EventStatusExtendedType)0x40\r
+#define        DEM_WARNING_INDICATOR_REQUESTED                         (Dem_EventStatusExtendedType)0x80\r
 \r
 /*\r
  * DemOperationCycleType\r

diff --git a/diagnostic/Det/Det.c b/diagnostic/Det/Det.c
index 5f61e4ea9e34562d3344879cf04b2ca965c4d1e0..da78ac5bffc3722462b9d6febdb67e6374edd6e2 100644 (file)
--- a/diagnostic/Det/Det.c
+++ b/diagnostic/Det/Det.c
@@ -39,6 +39,7 @@ static Det_StateType _detState = DET_UNINITIALIZED;
 #if ( DET_USE_RAMLOG == STD_ON )\r
 // Ram log variables in uninitialized memory\r
 uint32 Det_RamlogIndex __attribute__ ((section (".ramlog")));\r
+/*lint -esym(552,Det_RamLog)*/ /* supress lintwarning about Det_Ramlog not being accessed */\r
 Det_EntryType Det_RamLog[DET_RAMLOG_SIZE] __attribute__ ((section (".ramlog")));\r
 #endif\r
 \r
@@ -141,8 +142,9 @@ void Det_ReportError(uint16 ModuleId, uint8 InstanceId, uint8 ApiId, uint8 Error
             Det_RamLog[Det_RamlogIndex].errorId = ErrorId;\r
             Det_RamlogIndex++;\r
 #if ( DET_WRAP_RAMLOG == STD_ON )\r
-            if (Det_RamlogIndex == DET_RAMLOG_SIZE)\r
+            if (Det_RamlogIndex == DET_RAMLOG_SIZE){\r
                 Det_RamlogIndex = 0;\r
+            }\r
 #endif\r
         }\r
         Irq_Restore(old2);\r

diff --git a/include/Dem.h b/include/Dem.h
index 2c02c2aee4c8eb543542d9fcc370fa662cf31c0c..08aa56817c1eaed74405ef4beabebdf951621bf9 100644 (file)
--- a/include/Dem.h
+++ b/include/Dem.h
@@ -132,7 +132,7 @@ Std_ReturnType Dem_GetEventStatus(Dem_EventIdType eventId, Dem_EventStatusExtend
 Std_ReturnType Dem_GetEventFailed(Dem_EventIdType eventId, boolean *eventFailed); /** @req DEM196 */\r
 Std_ReturnType Dem_GetEventTested(Dem_EventIdType eventId, boolean *eventTested); /** @req DEM197 */\r
 Std_ReturnType Dem_GetFaultDetectionCounter(Dem_EventIdType eventId, sint8 *counter); /** @req DEM203 */\r
-Std_ReturnType Dem_SetOperationCycleState(Dem_OperationCycleIdType OperationCycleId, Dem_OperationCycleStateType CycleState); /** @req DEM194 */\r
+Std_ReturnType Dem_SetOperationCycleState(Dem_OperationCycleIdType operationCycleId, Dem_OperationCycleStateType cycleState); /** @req DEM194 */\r
 Std_ReturnType Dem_GetDTCOfEvent(Dem_EventIdType eventId, Dem_DTCKindType dtcKind, uint32* dtcOfEvent); /** @req DEM198 */\r
 \r
 \r
@@ -147,14 +147,14 @@ void Dem_ReportErrorStatus(Dem_EventIdType eventId ,uint8 eventStatus); /** @req
  */\r
 Dem_ReturnClearDTCType Dem_ClearDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin); /** @req DEM241 */\r
 Dem_ReturnSetDTCFilterType Dem_SetDTCFilter(uint8 dtcStatusMask, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, Dem_FilterWithSeverityType filterWithSeverity, Dem_DTCSeverityType dtcSeverityMask, Dem_FilterForFDCType filterForFaultDetectionCounter);  /** @req DEM208 */\r
-Dem_ReturnGetStatusOfDTCType Dem_GetStatusOfDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, Dem_EventStatusExtendedType* dtcStatus); /** @req DEM212 */\r
+Dem_ReturnGetStatusOfDTCType Dem_GetStatusOfDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, Dem_EventStatusExtendedType* status); /** @req DEM212 */\r
 Std_ReturnType Dem_GetDTCStatusAvailabilityMask(uint8 *dtcStatusMask); /** @req DEM213 */\r
 Dem_ReturnGetNumberOfFilteredDTCType Dem_GetNumberOfFilteredDtc(uint16* numberOfFilteredDTC); /** @req DEM214 */\r
 Dem_ReturnGetNextFilteredDTCType Dem_GetNextFilteredDTC(uint32* dtc, Dem_EventStatusExtendedType* dtcStatus); /** @req DEM215 */\r
 Dem_ReturnTypeOfDtcSupportedType Dem_GetTranslationType(void); /** @req DEM230 */\r
 Dem_ReturnControlDTCStorageType Dem_DisableDTCStorage(Dem_DTCGroupType dtcGroup, Dem_DTCKindType dtcKind); /** @req DEM242 */\r
 Dem_ReturnControlDTCStorageType Dem_EnableDTCStorage(Dem_DTCGroupType dtcGroup, Dem_DTCKindType dtcKind); /** @req DEM243 */\r
-Dem_ReturnGetExtendedDataRecordByDTCType Dem_GetExtendedDataRecordByDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, uint8 extendedDataNumber, uint8 *destBuffer, uint8 *bufSize); /** @req DEM239 */\r
+Dem_ReturnGetExtendedDataRecordByDTCType Dem_GetExtendedDataRecordByDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, uint8 extendedDataNumber, uint8 *destBuffer, uint16 *bufSize); /** @req DEM239 */\r
 Dem_ReturnGetSizeOfExtendedDataRecordByDTCType Dem_GetSizeOfExtendedDataRecordByDTC(uint32 dtc, Dem_DTCKindType dtcKind, Dem_DTCOriginType dtcOrigin, uint8 extendedDataNumber, uint16 *sizeOfExtendedDataRecord); /** @req DEM240 */\r
 \r
 \r

diff --git a/include/Platform_Types.h b/include/Platform_Types.h
index 7f9c000056074ac8486845886bc64286a0007a88..f3f28bae3c4dfc239388ae802d1ffab3a9248c1b 100644 (file)
--- a/include/Platform_Types.h
+++ b/include/Platform_Types.h
@@ -36,7 +36,7 @@ typedef unsigned char       uint8;
 typedef signed short        sint16;       \r
 typedef unsigned short      uint16;       \r
 typedef signed long         sint32;       \r
-typedef unsigned long       uint32;    \r
+typedef unsigned long      uint32;\r
 typedef unsigned long long  uint64;\r
 typedef unsigned long       uint8_least;  \r
 typedef unsigned long       uint16_least; \r
@@ -47,5 +47,7 @@ typedef signed long         sint32_least;
 typedef float               float32; \r
 typedef double              float64;  \r
 \r
+//EIJAklaga\r
+\r
 #endif\r
 /** @} */\r

diff --git a/include/Std_Types.h b/include/Std_Types.h
index fe5a70fdb32dcfeaf2a499654003f3766b517709..559383feddafbc400ef32a0f0beddafa5e0aa3da 100644 (file)
--- a/include/Std_Types.h
+++ b/include/Std_Types.h
@@ -71,11 +71,10 @@ typedef struct {
        ((_vi)->ar_patch_version =  _module ## _AR_PATCH_VERSION);\r
 \r
 \r
-// TODO: Move to OSEK implementation, See 8.2 in SWS_StandardTypes\r
-\r
-#define STATUSTYPEDEFINED\r
 typedef enum {\r
-       E_OK = 0,\r
+       E_OK = 0,                                               /**< Differs from spec. (see StandardTypes 8.2.1)  */\r
+       E_NOT_OK = 1,                                   /**< Differs from spec. (see StandardTypes 8.2.1)  */\r
+\r
        E_OS_ACCESS = 1,               /**< STD OSEK */\r
        E_OS_CALLEVEL = 2,             /**< STD OSEK */\r
        E_OS_ID = 3,                   /**< STD OSEK */\r
@@ -100,24 +99,15 @@ typedef enum {
        /* COM.. TODO: move ?? */\r
        E_COM_ID,\r
 \r
-\r
+       //EIJA\r
        /** Implementation specific */\r
        E_OS_SYS_APA,\r
 \r
-       E_NOT_OK,\r
 } StatusType;\r
 \r
 typedef uint8 Std_ReturnType;\r
 \r
 \r
-#ifndef STATUSTYPEDEFINED\r
-#define STATUSTYPEDEFINED\r
-#define E_OK                   0\r
-typedef unsigned char StatusType;\r
-#endif\r
-\r
-#define E_NOT_OK                               1\r
-\r
 #define E_NO_DTC_AVAILABLE             2\r
 #define E_SESSION_NOT_ALLOWED  4\r
 #define E_PROTOCOL_NOT_ALLOWED 5\r

diff --git a/scripts/rules.mk b/scripts/rules.mk
index 8e2aff80883b827252e14df14deb259547529950..5c71ea9fbc47149d1c11140e3fbf1a3a92fda243 100644 (file)
--- a/scripts/rules.mk
+++ b/scripts/rules.mk
@@ -127,9 +127,18 @@ inc-y += ../include
 # Some dependency for xxx_offset.c/h also\r
 -include $(subst .h,.d,$(dep-y))\r
 \r
+inc-y += /C/lint/lnt #To run PC-lint\r
+abs-inc-y = $(abspath $(inc-y))\r
+\r
+lint_exclude_path := arc-tests\r
+\r
 # Compile\r
 %.o: %.c\r
        @echo "  >> CC $(notdir $<)"\r
+# if path does not include "lint_exclude_path" then run PC-lint to check MISRA C standard\r
+       $(if $(findstring $(lint_exclude_path),$(abspath $<)),$(info $(abspath $<):0:0: Info: Not running lint MISRA check on $(abspath $<)),/C/lint/Lint-nt +v $(addprefix -i,$(abs-inc-y)) /C/lint/std.lnt  $(abspath $<))\r
+#      $(if $(findstring $(lint_exclude_path),$(abspath $<)),$(info $(abspath $<):0:0: Info: Not running lint MISRA check on $(abspath $<)),/C/lint/Lint-nt +v $(addprefix -i,$(abs-inc-y)) /C/lint/std.lnt  $(abspath $<))\r
+# compile\r
        $(Q)$(CC) -c $(CFLAGS) -o $(goal) $(addprefix -I ,$(inc-y)) $(addprefix -D,$(def-y)) $(abspath $<)\r
 \r
 # Assembler\r