Solved ticket refs #114

diff --git a/communication/CanIf/CanIf.c b/communication/CanIf/CanIf.c
index c4589a625976838f9777e945434f1226d802f609..74ff8de573b9c9eb65704769027fd546895fc1ff 100644 (file)
--- a/communication/CanIf/CanIf.c
+++ b/communication/CanIf/CanIf.c
@@ -61,13 +61,11 @@
           Det_ReportError(MODULE_ID_CANIF, 0, _api, _err); \\r
           return; \\r
         }\r
-#undef DET_REPORTERROR\r
 #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_NO_RV(_exp,_api,_err )\r
-#undef DET_REPORTERROR\r
 #define DET_REPORTERROR(_x,_y,_z,_q)\r
 #endif\r
 \r

diff --git a/communication/CanTp/CanTp.c b/communication/CanTp/CanTp.c
index 346f5596f03b7c62d65c9a004924f0ec3ff9c98d..37ac7b510c927f4b3bb7709e01a40086d346cb6a 100644 (file)
--- a/communication/CanTp/CanTp.c
+++ b/communication/CanTp/CanTp.c
@@ -60,13 +60,11 @@
           Det_ReportError(MODULE_ID_CANTP, 0, _api, _err); \\r
           return; \\r
         }\r
-#undef DET_REPORTERROR\r
 #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_NO_RV(_exp,_api,_err )\r
-#undef DET_REPORTERROR\r
 #define DET_REPORTERROR(_x,_y,_z,_q)\r
 #endif\r
 \r

diff --git a/communication/Com/Com.c b/communication/Com/Com.c
index edd21a7ae683610fdb40b69bb8de0d7ce4edcf84..e0552d9f9ef278e04288c18addf332a660cae1bc 100644 (file)
--- a/communication/Com/Com.c
+++ b/communication/Com/Com.c
@@ -70,7 +70,7 @@ void Com_Init(const Com_ConfigType *config ) {
                ComGetArcIPdu(i);\r
 \r
                if (i >= COM_N_IPDUS) {\r
-                       DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_TOO_MANY_IPDU);\r
+                       COM_DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_TOO_MANY_IPDU);\r
                        assert(0);\r
                        failure = 1;\r
                        break;\r
@@ -107,7 +107,7 @@ void Com_Init(const Com_ConfigType *config ) {
 \r
                        // If this signal already has been configured this is most likely an error.\r
                        if (Arc_Signal->ComIPduDataPtr != NULL) {\r
-                               // DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_SIGNAL_CONFIGURATION);\r
+                               // COM_DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_SIGNAL_CONFIGURATION);\r
                                // failure = 1;\r
                        }\r
 \r
@@ -178,7 +178,7 @@ void Com_Init(const Com_ConfigType *config ) {
                                        || Signal->ComFilter.ComFilterAlgorithm == NEW_IS_OUTSIDE\r
                                        || Signal->ComFilter.ComFilterAlgorithm == ONE_EVERY_N))) {\r
 \r
-                                       DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);\r
+                                       COM_DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);\r
                                        failure = 1;\r
                                }\r
 \r
@@ -189,7 +189,7 @@ void Com_Init(const Com_ConfigType *config ) {
                                        || Signal->ComFilter.ComFilterAlgorithm == NEW_IS_OUTSIDE))) {\r
 \r
 \r
-                                       DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);\r
+                                       COM_DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);\r
                                        failure = 1;\r
                                }\r
                        // Initialize filter values. COM230\r
@@ -219,7 +219,7 @@ void Com_Init(const Com_ConfigType *config ) {
                        //free(ComConfig->ComIPdu[i].ComIPduDataPtr);\r
                }\r
                DEBUG(DEBUG_LOW, "--Initialization of COM failed--\n");\r
-               //DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);\r
+               //COM_DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);\r
        } else {\r
                DEBUG(DEBUG_LOW, "--Initialization of COM completed--\n");\r
        }\r

diff --git a/communication/Com/Com_Com.c b/communication/Com/Com_Com.c
index 6e4d39a8613e7c66827fe3b9475a599ca701825a..449857f4e0fce028f258f45baca25c2e3930b00c 100644 (file)
--- a/communication/Com/Com_Com.c
+++ b/communication/Com/Com_Com.c
@@ -75,7 +75,7 @@ uint8 Com_ReceiveSignal(Com_SignalIdType SignalId, void* SignalDataPtr) {
 }\r
 \r
 Std_ReturnType Com_TriggerTransmit(PduIdType ComTxPduId, uint8 *SduPtr) {\r
-       PduIdCheck(ComTxPduId, 0x13, E_NOT_OK);\r
+       Com_PduIdCheck(ComTxPduId, 0x13, E_NOT_OK);\r
        /*\r
         * COM260: This function must not check the transmission mode of the I-PDU\r
         * since it should be possible to use it regardless of the transmission mode.\r
@@ -93,7 +93,7 @@ Std_ReturnType Com_TriggerTransmit(PduIdType ComTxPduId, uint8 *SduPtr) {
 \r
 \r
 void Com_TriggerIPduSend(PduIdType ComTxPduId) {\r
-       PduIdCheck(ComTxPduId, 0x17);\r
+       Com_PduIdCheck(ComTxPduId, 0x17);\r
 \r
        //DEBUG(DEBUG_MEDIUM, "Com_TriggerIPduSend sending IPdu %d... ", ComTxPduId);\r
        ComGetIPdu(ComTxPduId);\r
@@ -145,7 +145,7 @@ void Com_TriggerIPduSend(PduIdType ComTxPduId) {
 }\r
 \r
 Std_ReturnType Com_RxIndication(PduIdType ComRxPduId, const uint8* SduPtr) {\r
-       PduIdCheck(ComRxPduId, 0x14, E_NOT_OK);\r
+       Com_PduIdCheck(ComRxPduId, 0x14, E_NOT_OK);\r
 \r
        ComGetIPdu(ComRxPduId);\r
        ComGetArcIPdu(ComRxPduId);\r
@@ -213,7 +213,7 @@ Std_ReturnType Com_RxIndication(PduIdType ComRxPduId, const uint8* SduPtr) {
 }\r
 \r
 void Com_TxConfirmation(PduIdType ComTxPduId) {\r
-       PduIdCheck(ComTxPduId, 0x15);\r
+       Com_PduIdCheck(ComTxPduId, 0x15);\r
 }\r
 \r
 \r

diff --git a/communication/PduR/PduR.c b/communication/PduR/PduR.c
index f9882dd7c235b26b05567e5752cb997671899f7a..a722f2cff1838ac166f33920c3a3ae7a5a93b985 100644 (file)
--- a/communication/PduR/PduR.c
+++ b/communication/PduR/PduR.c
@@ -57,12 +57,12 @@ void PduR_Init (const PduR_PBConfigType* ConfigPtr) {
        // Otherwise raise an error.\r
        if (PduRState != PDUR_UNINIT) {\r
                // Raise error and return.\r
-               DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, 0x00, PDUR_E_INVALID_REQUEST);\r
+               PDUR_DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, 0x00, PDUR_E_INVALID_REQUEST);\r
                return;\r
        }\r
 \r
        if (ConfigPtr == NULL) {\r
-               DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, 0x00, PDUR_E_CONFIG_PTR_INVALID);\r
+               PDUR_DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, 0x00, PDUR_E_CONFIG_PTR_INVALID);\r
                return;\r
        } else {\r
                PduRConfig = ConfigPtr;\r
@@ -209,7 +209,7 @@ void PduR_GetVersionInfo (Std_VersionInfoType* versionInfo){
 #endif\r
 \r
 uint32 PduR_GetConfigurationId () {\r
-       //DevCheck(0,1,0x18,E_NOT_OK);\r
+       //PduR_DevCheck(0,1,0x18,E_NOT_OK);\r
        return PduRConfig->PduRConfigurationId;\r
 }\r
 #endif // End of not Zero Cost Operation Mode\r

diff --git a/communication/PduR/PduR_CanIf.c b/communication/PduR/PduR_CanIf.c
index 4f475f3e9b4747eaf13134a6e2f285b0a0fbfb86..513aa64a2c559029dbc7d11a534bd80fc0d040a3 100644 (file)
--- a/communication/PduR/PduR_CanIf.c
+++ b/communication/PduR/PduR_CanIf.c
@@ -27,7 +27,7 @@
 \r
 void PduR_CanIfRxIndication(PduIdType CanRxPduId,const uint8* CanSduPtr) {\r
 #if (PDUR_CANIF_SUPPORT == STD_ON)\r
-       DevCheck(CanRxPduId,CanSduPtr,0x0e);\r
+       PduR_DevCheck(CanRxPduId,CanSduPtr,0x0e);\r
 \r
        DEBUG(DEBUG_LOW,"----------------------\n");\r
        DEBUG(DEBUG_LOW,"PduR_CanIfRxIndication: received indication with id %d and data %d\n", CanRxPduId, *CanSduPtr);\r
@@ -40,7 +40,7 @@ void PduR_CanIfRxIndication(PduIdType CanRxPduId,const uint8* CanSduPtr) {
 \r
 void PduR_CanIfTxConfirmation(PduIdType CanTxPduId) {\r
 #if (PDUR_CANIF_SUPPORT == STD_ON)\r
-       DevCheck(CanTxPduId,1,0x0f);\r
+       PduR_DevCheck(CanTxPduId,1,0x0f);\r
 \r
        DEBUG(DEBUG_LOW,"----------------------\n");\r
        DEBUG(DEBUG_LOW,"PduR_CanIfTxConfirmation: received confirmation with id %d\n", CanTxPduId);\r

diff --git a/communication/PduR/PduR_CanTp.c b/communication/PduR/PduR_CanTp.c
index b06f9f25d6aecffc1189902a9f9d0e36a025bd81..3e8a15faca4e56d379d81a77f2e2d10d7d01b9a9 100644 (file)
--- a/communication/PduR/PduR_CanTp.c
+++ b/communication/PduR/PduR_CanTp.c
@@ -60,7 +60,7 @@ BufReq_ReturnType PduR_CanTpProvideTxBuffer(PduIdType CanTpTxPduId, PduInfoType*
 \r
 void PduR_CanTpTxConfirmation(PduIdType CanTpTxPduId, NotifResultType Result) {\r
 #if (PDUR_CANTP_SUPPORT == STD_ON)\r
-       DevCheck(CanTpTxPduId,1,0x0f);\r
+       PduR_DevCheck(CanTpTxPduId,1,0x0f);\r
 \r
        DEBUG(DEBUG_LOW,"----------------------\n");\r
        DEBUG(DEBUG_LOW,"PduR_CanIfTxConfirmation: received confirmation with id %d\n", CanTxPduId);\r

diff --git a/communication/PduR/PduR_Com.c b/communication/PduR/PduR_Com.c
index da93c3e8f5182452000e4a8b5a6958d6d38f58c1..7cfcfc8789eb0c44df9f33e028c644224ee68e7b 100644 (file)
--- a/communication/PduR/PduR_Com.c
+++ b/communication/PduR/PduR_Com.c
@@ -30,7 +30,7 @@
 Std_ReturnType PduR_ComTransmit(PduIdType ComTxPduId, const PduInfoType* PduInfoPtr) {\r
        BufReq_ReturnType retVal = BUFREQ_NOT_OK;\r
 #if (PDUR_COM_SUPPORT == STD_ON)\r
-       DevCheck(ComTxPduId,PduInfoPtr,0x15, E_NOT_OK);\r
+       PduR_DevCheck(ComTxPduId,PduInfoPtr,0x15, E_NOT_OK);\r
 \r
        //DEBUG(DEBUG_LOW,"PduR_ComTransmit: received transmit request with id %d and data %d\n", ComTxPduId, *PduInfoPtr->SduDataPtr);\r
        PduRRoutingPath_type *route = &PduRConfig->PduRRoutingTable->PduRRoutingPath[ComTxPduId];\r

diff --git a/communication/PduR/PduR_Dcm.c b/communication/PduR/PduR_Dcm.c
index bc62ebda11e24ac4b9c6f18409413a844bfbc1e0..bbbc192c13d6b149c554edf2ddc556dffc83bb6b 100644 (file)
--- a/communication/PduR/PduR_Dcm.c
+++ b/communication/PduR/PduR_Dcm.c
@@ -25,7 +25,7 @@
 Std_ReturnType PduR_DcmTransmit(PduIdType DcmTxPduId, const PduInfoType* PduInfoPtr) {\r
        BufReq_ReturnType retVal = BUFREQ_NOT_OK;\r
 #if (PDUR_DCM_SUPPORT == STD_ON)\r
-       DevCheck(DcmTxPduId,PduInfoPtr,0x15, E_NOT_OK);\r
+       PduR_DevCheck(DcmTxPduId,PduInfoPtr,0x15, E_NOT_OK);\r
 \r
        //DEBUG(DEBUG_LOW,"PduR_ComTransmit: received transmit request with id %d and data %d\n", ComTxPduId, *PduInfoPtr->SduDataPtr);\r
 \r

diff --git a/communication/PduR/PduR_LinIf.c b/communication/PduR/PduR_LinIf.c
index cab5c7398240fd749c5a190737311c804bacc4f7..6b11c584942cb0cdcaeb154da896b50a6ec38c07 100644 (file)
--- a/communication/PduR/PduR_LinIf.c
+++ b/communication/PduR/PduR_LinIf.c
@@ -26,7 +26,7 @@
 \r
 void PduR_LinIfRxIndication(PduIdType LinRxPduId, const uint8* LinSduPtr) {\r
 #if (PDUR_LINIF_SUPPORT == STD_ON)\r
-       DevCheck(LinRxPduId,LinSduPtr,0x0e);\r
+       PduR_DevCheck(LinRxPduId,LinSduPtr,0x0e);\r
 \r
        DEBUG(DEBUG_LOW,"----------------------\n");\r
        DEBUG(DEBUG_LOW,"PduR_LinIfRxIndication: received indication with id %d and data %d\n", LinRxPduId, *LinSduPtr);\r
@@ -39,7 +39,7 @@ void PduR_LinIfRxIndication(PduIdType LinRxPduId, const uint8* LinSduPtr) {
 \r
 void PduR_LinIfTxConfirmation(PduIdType LinTxPduId) {\r
 #if (PDUR_LINIF_SUPPORT == STD_ON)\r
-       DevCheck(LinTxPduId,1,0x0f);\r
+       PduR_DevCheck(LinTxPduId,1,0x0f);\r
 \r
        DEBUG(DEBUG_LOW,"----------------------\n");\r
        DEBUG(DEBUG_LOW,"PduR_LinIfTxConfirmation: received confirmation with id %d\n", LinTxPduId);\r
@@ -52,7 +52,7 @@ void PduR_LinIfTxConfirmation(PduIdType LinTxPduId) {
 \r
 void PduR_LinIfTriggerTransmit(PduIdType LinTxPduId, uint8* LinSduPtr) {\r
 #if (PDUR_LINIF_SUPPORT == STD_ON)\r
-       DevCheck(LinTxPduId,LinSduPtr,0x10);\r
+       PduR_DevCheck(LinTxPduId,LinSduPtr,0x10);\r
 \r
        DEBUG(DEBUG_LOW,"----------------------\n");\r
        DEBUG(DEBUG_LOW,"PduR_LinIfTriggerTransmit: received request with id %d\n", LinTxPduId);\r

diff --git a/diagnostic/Dcm/Dcm_Internal.h b/diagnostic/Dcm/Dcm_Internal.h
index dab055ef87973393ac13bfc57a0b2686401604ba..650634f687eea01e9c4761ad306e280ddea38230 100644 (file)
--- a/diagnostic/Dcm/Dcm_Internal.h
+++ b/diagnostic/Dcm/Dcm_Internal.h
@@ -41,14 +41,12 @@
           Det_ReportError(MODULE_ID_DCM, 0, _api, _err); \\r
           return; \\r
         }\r
-#undef DET_REPORTERROR\r
 #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
-#undef DET_REPORTERROR\r
 #define DET_REPORTERROR(_x,_y,_z,_q)\r
 #endif\r
 \r

diff --git a/include/Com.h b/include/Com.h
index 71af27a63a1a0cd2f3797cf3eacbe38f9446aa89..f4b10de101d502fa6e7ea40fabea680b3531ee64 100644 (file)
--- a/include/Com.h
+++ b/include/Com.h
@@ -47,30 +47,28 @@ const Com_ConfigType * ComConfig;
 \r
 #ifdef COM_DEV_ERROR_DETECT\r
 \r
-#undef DET_REPORTERROR\r
-#define DET_REPORTERROR(_x,_y,_z,_q) Det_ReportError(_x,_y,_z,_q)\r
+#define COM_DET_REPORTERROR(_x,_y,_z,_q) Det_ReportError(_x,_y,_z,_q)\r
 \r
 \r
 // Define macro for parameter check.\r
-#define PduIdCheck(PduId,ApiId,...) \\r
+#define Com_PduIdCheck(PduId,ApiId,...) \\r
        if (PduId >= Com_Arc_Config.ComNIPdu) { \\r
-               DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, ApiId, COM_INVALID_PDU_ID); \\r
+               COM_DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, ApiId, COM_INVALID_PDU_ID); \\r
                return __VA_ARGS__; \\r
        } \\r
 \r
 #define COM_VALIDATE_SIGNAL(SignalId, ApiId, ...) \\r
        if (ComConfig->ComSignal[SignalId].Com_Arc_IsSignalGroup) { \\r
-               DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, ApiId, COM_ERROR_SIGNAL_IS_SIGNALGROUP); \\r
+               COM_DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, ApiId, COM_ERROR_SIGNAL_IS_SIGNALGROUP); \\r
                return __VA_ARGS__; \\r
        } \\r
 \r
 \r
 #else\r
 \r
-#undef DET_REPORTERROR\r
-#define DET_REPORTERROR(_x,_y,_z,_q)\r
+#define COM_DET_REPORTERROR(_x,_y,_z,_q)\r
 \r
-#define PduIdCheck(PduId,ApiId,...)\r
+#define Com_PduIdCheck(PduId,ApiId,...)\r
 #define COM_VALIDATE_SIGNAL(PduId, ApiId, ...)\r
 #endif\r
 \r

diff --git a/include/PduR.h b/include/PduR.h
index e7384f4f6add3b73d941e8d4011a0e0617dd6947..1dca7817e469a3fccb6382a2b2f1d21950301a02 100644 (file)
--- a/include/PduR.h
+++ b/include/PduR.h
@@ -66,31 +66,29 @@ extern const PduR_PBConfigType *PduRConfig;
 \r
 #if (PDUR_DEV_ERROR_DETECT == STD_ON)\r
 \r
-#undef DET_REPORTERROR\r
-#define DET_REPORTERROR(_x,_y,_z,_q) Det_ReportError(_x,_y,_z,_q)\r
+#define PDUR_DET_REPORTERROR(_x,_y,_z,_q) Det_ReportError(_x,_y,_z,_q)\r
 \r
 // Define macro for state, parameter and data pointer checks.\r
 // TODO Implement data range check if needed.\r
-#define DevCheck(PduId,PduPtr,ApiId,...) \\r
+#define PduR_DevCheck(PduId,PduPtr,ApiId,...) \\r
        if (PduRState == PDUR_UNINIT || PduRState == PDUR_REDUCED) { \\r
-               DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, ApiId, PDUR_E_INVALID_REQUEST); \\r
-               DEBUG(DEBUG_LOW,"PDU Router not initialized. Routing request ignored.\n"); \\r
+               PDUR_DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, ApiId, PDUR_E_INVALID_REQUEST); \\r
+               /* DEBUG(DEBUG_LOW,"PDU Router not initialized. Routing request ignored.\n"); */ \\r
                return __VA_ARGS__; \\r
        } \\r
        if (PduPtr == 0 && PDUR_DEV_ERROR_DETECT) { \\r
-               DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, ApiId, PDUR_E_DATA_PTR_INVALID); \\r
+               PDUR_DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, ApiId, PDUR_E_DATA_PTR_INVALID); \\r
                return __VA_ARGS__; \\r
        } \\r
        if ((PduId >= PduRConfig->PduRRoutingTable->NRoutingPaths) && PDUR_DEV_ERROR_DETECT) { \\r
-               DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, ApiId, PDUR_E_PDU_ID_INVALID); \\r
+               PDUR_DET_REPORTERROR(MODULE_ID_PDUR, PDUR_INSTANCE_ID, ApiId, PDUR_E_PDU_ID_INVALID); \\r
                return __VA_ARGS__; \\r
-       } \\r
+       }\r
 \r
 \r
 #else\r
-#undef DET_REPORTERROR\r
-#define DET_REPORTERROR(_x,_y,_z,_q)\r
-#define DevCheck(...)\r
+#define PDUR_DET_REPORTERROR(_x,_y,_z,_q)\r
+#define PduR_DevCheck(...)\r
 \r
 #endif\r
 \r