Merge with 55ab039c2569c5946bde91fa87dbd94dac4aed51

[arc.git] / communication / Com / Com_misc.c

diff --git a/communication/Com/Com_misc.c b/communication/Com/Com_misc.c
index 3f305b144cf1015216c942dfae786635caa19a4a..c433347ddd064c540d6f957d45063a5a940056ee 100644 (file)
--- a/communication/Com/Com_misc.c
+++ b/communication/Com/Com_misc.c
@@ -33,15 +33,13 @@ void Com_ReadSignalDataFromPdu(
 \r
        // Get PDU\r
        const ComSignal_type * Signal = GET_Signal(signalId);\r
-       Com_Arc_Signal_type * Arc_Signal = GET_ArcSignal(Signal->ComHandleId);\r
-       Com_Arc_IPdu_type *Arc_IPdu = GET_ArcIPdu(Arc_Signal->ComIPduHandleId);\r
-       uint8 pduSize = GET_IPdu(Arc_Signal->ComIPduHandleId)->ComIPduSize;\r
+       uint8 pduSize = GET_IPdu(Signal->ComIPduHandleId)->ComIPduSize;\r
        // Get data\r
        Com_ReadSignalDataFromPduBuffer(\r
                        signalId,\r
                        FALSE,\r
                        signalData,\r
-                       Arc_IPdu->ComIPduDataPtr,\r
+                       GET_IPdu(Signal->ComIPduHandleId)->ComIPduDataPtr,\r
                        pduSize);\r
 }\r
 \r
@@ -52,15 +50,13 @@ void Com_ReadGroupSignalDataFromPdu(
 \r
        // Get PDU\r
        const ComSignal_type * Signal = GET_Signal(parentSignalId);\r
-       Com_Arc_Signal_type * Arc_Signal = GET_ArcSignal(Signal->ComHandleId);\r
-       Com_Arc_IPdu_type *Arc_IPdu = GET_ArcIPdu(Arc_Signal->ComIPduHandleId);\r
-       uint8 pduSize = GET_IPdu(Arc_Signal->ComIPduHandleId)->ComIPduSize;\r
+       uint8 pduSize = GET_IPdu(Signal->ComIPduHandleId)->ComIPduSize;\r
        // Get data\r
        Com_ReadSignalDataFromPduBuffer(\r
                        groupSignalId,\r
                        TRUE,\r
                        signalData,\r
-                       Arc_IPdu->ComIPduDataPtr,\r
+                       GET_IPdu(Signal->ComIPduHandleId)->ComIPduDataPtr,\r
                        pduSize);\r
 }\r
 \r
@@ -157,16 +153,14 @@ void Com_WriteSignalDataToPdu(
 \r
        // Get PDU\r
        const ComSignal_type *Signal     = GET_Signal(signalId);\r
-       Com_Arc_Signal_type  *Arc_Signal = GET_ArcSignal(Signal->ComHandleId);\r
-       Com_Arc_IPdu_type    *Arc_IPdu   = GET_ArcIPdu(Arc_Signal->ComIPduHandleId);\r
-       const ComIPdu_type   *IPdu       = GET_IPdu(Arc_Signal->ComIPduHandleId);\r
+       const ComIPdu_type   *IPdu       = GET_IPdu(Signal->ComIPduHandleId);\r
 \r
        // Get data\r
        Com_WriteSignalDataToPduBuffer(\r
                        signalId,\r
                        FALSE,\r
                        signalData,\r
-                       Arc_IPdu->ComIPduDataPtr,\r
+                       (void *)IPdu->ComIPduDataPtr,\r
                        IPdu->ComIPduSize);\r
 }\r
 \r
@@ -177,16 +171,14 @@ void Com_WriteGroupSignalDataToPdu(
 \r
        // Get PDU\r
        const ComSignal_type *Signal     = GET_Signal(parentSignalId);\r
-       Com_Arc_Signal_type  *Arc_Signal = GET_ArcSignal(Signal->ComHandleId);\r
-       Com_Arc_IPdu_type    *Arc_IPdu   = GET_ArcIPdu(Arc_Signal->ComIPduHandleId);\r
-       const ComIPdu_type   *IPdu       = GET_IPdu(Arc_Signal->ComIPduHandleId);\r
+       const ComIPdu_type   *IPdu       = GET_IPdu(Signal->ComIPduHandleId);\r
 \r
        // Get data\r
        Com_WriteSignalDataToPduBuffer(\r
                        groupSignalId,\r
                        TRUE,\r
                        signalData,\r
-                       Arc_IPdu->ComIPduDataPtr,\r
+                       (void *)IPdu->ComIPduDataPtr,\r
                        IPdu->ComIPduSize);\r
 }\r
 \r
@@ -505,7 +497,7 @@ void Com_RxProcessSignals(const ComIPdu_type *IPdu,Com_Arc_IPdu_type *Arc_IPdu)
 \r
                // If this signal uses an update bit, then it is only considered if this bit is set.\r
                if ( (!comSignal->ComSignalArcUseUpdateBit) ||\r
-                       ( (comSignal->ComSignalArcUseUpdateBit) && (TESTBIT(Arc_IPdu->ComIPduDataPtr, comSignal->ComUpdateBitPosition)) ) ) {\r
+                       ( (comSignal->ComSignalArcUseUpdateBit) && (TESTBIT(IPdu->ComIPduDataPtr, comSignal->ComUpdateBitPosition)) ) ) {\r
 \r
                        if (comSignal->ComTimeoutFactor > 0) { // If reception deadline monitoring is used.\r
                                // Reset the deadline monitoring timer.\r