From 8538b9d83a40466c38a43af787bb079d0a3b2584 Mon Sep 17 00:00:00 2001
From: maek <devnull@localhost>
Date: Wed, 5 Jan 2011 15:47:04 +0100
Subject: [PATCH] Fix ticket 133.

---
 communication/Com/Com.c | 34 ----------------------------------
 include/Com_Types.h     |  9 +++------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/communication/Com/Com.c b/communication/Com/Com.c
index 0483cc6a..0b8120aa 100644
--- a/communication/Com/Com.c
+++ b/communication/Com/Com.c
@@ -137,40 +137,6 @@ void Com_Init(const Com_ConfigType *config ) {
 				// Initialize signal data.
 				Com_WriteSignalDataToPdu(Signal->ComHandleId, Signal->ComSignalInitValue);
 			}
-
-			// Check filter configuration
-			if (IPdu->ComIPduDirection == RECEIVE) {
-
-				// This represents an invalid configuration of the UINT8_N datatype
-				//lint -save -esym(960,12.5) PC-Lint Exception: It is checked and OK. PC-Lint missunderstands rule 12.5 in this case.
-				if (( (Signal->ComSignalType == UINT8_N)
-					&&
-					( (Signal->ComFilter.ComFilterAlgorithm == MASKED_NEW_EQUALS_X)
-					|| (Signal->ComFilter.ComFilterAlgorithm == MASKED_NEW_DIFFERS_X)
-					|| (Signal->ComFilter.ComFilterAlgorithm == MASKED_NEW_DIFFERS_MASKED_OLD)
-					|| (Signal->ComFilter.ComFilterAlgorithm == NEW_IS_WITHIN)
-					|| (Signal->ComFilter.ComFilterAlgorithm == NEW_IS_OUTSIDE)
-					|| (Signal->ComFilter.ComFilterAlgorithm == ONE_EVERY_N) ))) {
-
-					DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);
-					failure = 1;
-				}
-				//lint -restore
-
-				// This represents an invalid configuration of the BOOLEAN datatype
-				if (( (Signal->ComSignalType == BOOLEAN)
-					&&
-					( (Signal->ComFilter.ComFilterAlgorithm == NEW_IS_WITHIN)
-					|| (Signal->ComFilter.ComFilterAlgorithm == NEW_IS_OUTSIDE) ))) {
-
-
-					DET_REPORTERROR(COM_MODULE_ID, COM_INSTANCE_ID, 0x01, COM_E_INVALID_FILTER_CONFIGURATION);
-					failure = 1;
-				}
-			// Initialize filter values. COM230
-			//signal.ComFilter.ComFilterNewValue = ComConfig->ComIPdu[i].ComTxIPdu.ComTxIPduUnusedAreasDefault;
-			//signal.ComFilter.ComFilterOldValue = ComConfig->ComIPdu[i].ComTxIPdu.ComTxIPduUnusedAreasDefault;
-			}
 		}
 
 		// Configure per I-PDU based deadline monitoring.
diff --git a/include/Com_Types.h b/include/Com_Types.h
index f079f74f..71fff03d 100644
--- a/include/Com_Types.h
+++ b/include/Com_Types.h
@@ -174,7 +174,7 @@ typedef struct {
 	/** Filter for this signal.
 	 * NOT SUPPORTED
 	 */
-	const ComFilter_type ComFilter;
+	//const ComFilter_type ComFilter;
 
 	/* Pointer to the shadow buffer of the signal group that this group signal is contained in.
 	 *
@@ -238,7 +238,7 @@ typedef struct {
 	/** The number of bytes if the signal has type UINT8_N;
 	 * Range 1 to 8.
 	 */
-	const uint8 ComSignalLength;
+	//const uint8 ComSignalLength;
 
 	/** Defines the type of the signal. */
 	const Com_SignalType ComSignalType;
@@ -265,7 +265,7 @@ typedef struct {
 	/** Filter for this signal.
 	 * NOT SUPPORTED.
 	 */
-	const ComFilter_type ComFilter;
+	//const ComFilter_type ComFilter;
 
 	/** Marks if this signal is a signal group.
 	 * Should be set to 1 if the signal is a signal group.
@@ -375,9 +375,6 @@ typedef struct {
 	boolean (*ComIPduCallout)(PduIdType PduId, const uint8 *IPduData);
 
 
-	/** The ID of this IPDU. */
-	const uint8 ComIPduRxHandleId;
-
 	/** The outgoing PDU id. For polite PDU id handling. */
 	const uint8 ArcIPduOutgoingId;
 
-- 
2.39.2