Fix ticket 133.

diff --git a/communication/Com/Com.c b/communication/Com/Com.c
index 0483cc6a1c7501a8a8db01723b9f9e6e8864b3ef..0b8120aa77dc6d48d927a1e3cf72c36971b6df76 100644 (file)
--- a/communication/Com/Com.c
+++ b/communication/Com/Com.c
@@ -137,40 +137,6 @@ void Com_Init(const Com_ConfigType *config ) {
                                // Initialize signal data.\r
                                Com_WriteSignalDataToPdu(Signal->ComHandleId, Signal->ComSignalInitValue);\r
                        }\r
-\r
-                       // Check filter configuration\r
-                       if (IPdu->ComIPduDirection == RECEIVE) {\r
-\r
-                               // This represents an invalid configuration of the UINT8_N datatype\r
-                               //lint -save -esym(960,12.5) PC-Lint Exception: It is checked and OK. PC-Lint missunderstands rule 12.5 in this case.\r
-                               if (( (Signal->ComSignalType == UINT8_N)\r
-                                       &&\r
-                                       ( (Signal->ComFilter.ComFilterAlgorithm == MASKED_NEW_EQUALS_X)\r
-                                       || (Signal->ComFilter.ComFilterAlgorithm == MASKED_NEW_DIFFERS_X)\r
-                                       || (Signal->ComFilter.ComFilterAlgorithm == MASKED_NEW_DIFFERS_MASKED_OLD)\r
-                                       || (Signal->ComFilter.ComFilterAlgorithm == NEW_IS_WITHIN)\r
-                                       || (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
-                                       failure = 1;\r
-                               }\r
-                               //lint -restore\r
-\r
-                               // This represents an invalid configuration of the BOOLEAN datatype\r
-                               if (( (Signal->ComSignalType == BOOLEAN)\r
-                                       &&\r
-                                       ( (Signal->ComFilter.ComFilterAlgorithm == NEW_IS_WITHIN)\r
-                                       || (Signal->ComFilter.ComFilterAlgorithm == NEW_IS_OUTSIDE) ))) {\r
-\r
-\r
-                                       DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);\r
-                                       failure = 1;\r
-                               }\r
-                       // Initialize filter values. COM230\r
-                       //signal.ComFilter.ComFilterNewValue = ComConfig->ComIPdu[i].ComTxIPdu.ComTxIPduUnusedAreasDefault;\r
-                       //signal.ComFilter.ComFilterOldValue = ComConfig->ComIPdu[i].ComTxIPdu.ComTxIPduUnusedAreasDefault;\r
-                       }\r
                }\r
 \r
                // Configure per I-PDU based deadline monitoring.\r

diff --git a/include/Com_Types.h b/include/Com_Types.h
index f079f74fb213cc1211ae271d9850dfc190b9e069..71fff03d2a368a0d48c6c2b802a70f925d1bb1e5 100644 (file)
--- a/include/Com_Types.h
+++ b/include/Com_Types.h
@@ -174,7 +174,7 @@ typedef struct {
        /** Filter for this signal.\r
         * NOT SUPPORTED\r
         */\r
-       const ComFilter_type ComFilter;\r
+       //const ComFilter_type ComFilter;\r
 \r
        /* Pointer to the shadow buffer of the signal group that this group signal is contained in.\r
         *\r
@@ -238,7 +238,7 @@ typedef struct {
        /** The number of bytes if the signal has type UINT8_N;\r
         * Range 1 to 8.\r
         */\r
-       const uint8 ComSignalLength;\r
+       //const uint8 ComSignalLength;\r
 \r
        /** Defines the type of the signal. */\r
        const Com_SignalType ComSignalType;\r
@@ -265,7 +265,7 @@ typedef struct {
        /** Filter for this signal.\r
         * NOT SUPPORTED.\r
         */\r
-       const ComFilter_type ComFilter;\r
+       //const ComFilter_type ComFilter;\r
 \r
        /** Marks if this signal is a signal group.\r
         * Should be set to 1 if the signal is a signal group.\r
@@ -375,9 +375,6 @@ typedef struct {
        boolean (*ComIPduCallout)(PduIdType PduId, const uint8 *IPduData);\r
 \r
 \r
-       /** The ID of this IPDU. */\r
-       const uint8 ComIPduRxHandleId;\r
-\r
        /** The outgoing PDU id. For polite PDU id handling. */\r
        const uint8 ArcIPduOutgoingId;\r
 \r