From bfc0e213c7d232ec6ae738f5fdeb2ee219044a1b Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Sat, 12 Nov 2022 07:20:26 +0000
Subject: [PATCH] - removed deprecated compatibility defined for very old
 library versions

---
 config/stack_config.h                         |  3 --
 config/stack_config.h.cmake                   |  3 --
 src/iec61850/inc/iec61850_common.h            | 19 ----------
 src/iec61850/inc/iec61850_model.h             | 38 -------------------
 .../iso_mms/client/mms_client_connection.c    |  4 --
 5 files changed, 67 deletions(-)

diff --git a/config/stack_config.h b/config/stack_config.h
index 8a71f0c3..2559069c 100644
--- a/config/stack_config.h
+++ b/config/stack_config.h
@@ -229,9 +229,6 @@
 
 #define CONFIG_INCLUDE_PLATFORM_SPECIFIC_HEADERS 0
 
-/* use short FC defines as in old API */
-#define CONFIG_PROVIDE_OLD_FC_DEFINES 0
-
 /* Support user access to raw messages */
 #define CONFIG_MMS_RAW_MESSAGE_LOGGING 1
 
diff --git a/config/stack_config.h.cmake b/config/stack_config.h.cmake
index d3ef67b5..c14b0c20 100644
--- a/config/stack_config.h.cmake
+++ b/config/stack_config.h.cmake
@@ -215,9 +215,6 @@
 
 #define CONFIG_INCLUDE_PLATFORM_SPECIFIC_HEADERS 0
 
-/* use short FC defines as in old API */
-#define CONFIG_PROVIDE_OLD_FC_DEFINES 0
-
 /* Support user acccess to raw messages */
 #cmakedefine01 CONFIG_MMS_RAW_MESSAGE_LOGGING
 
diff --git a/src/iec61850/inc/iec61850_common.h b/src/iec61850/inc/iec61850_common.h
index c2765c45..9a364656 100644
--- a/src/iec61850/inc/iec61850_common.h
+++ b/src/iec61850/inc/iec61850_common.h
@@ -241,25 +241,6 @@ typedef enum {
  * @{
  */
 
-#if (CONFIG_PROVIDE_OLD_FC_DEFINES == 1)
-#define ST IEC61850_FC_ST
-#define MX IEC61850_FC_MX
-#define SP IEC61850_FC_SP
-#define SV IEC61850_FC_SV
-#define CF IEC61850_FC_CF
-#define DC IEC61850_FC_DC
-#define SG IEC61850_FC_SG
-#define SE IEC61850_FC_SE
-#define SR IEC61850_FC_SR
-#define OR IEC61850_FC_OR
-#define BL IEC61850_FC_BL
-#define EX IEC61850_FC_EX
-#define CO IEC61850_FC_CO
-#define ALL IEC61850_FC_ALL
-#define NONE IEC61850_FC_NONE
-#endif /* (CONFIG_PROVIDE_OLD_FC_DEFINES == 1) */
-
-
 /** FCs (Functional constraints) according to IEC 61850-7-2 */
 typedef enum eFunctionalConstraint {
     /** Status information */
diff --git a/src/iec61850/inc/iec61850_model.h b/src/iec61850/inc/iec61850_model.h
index 750f47ac..a7ea685e 100644
--- a/src/iec61850/inc/iec61850_model.h
+++ b/src/iec61850/inc/iec61850_model.h
@@ -121,44 +121,6 @@ typedef enum {
 	IEC61850_CURRENCY = 30,
 	IEC61850_OPTFLDS = 31, /* bit-string(10) */
 	IEC61850_TRGOPS = 32 /* bit-string(6) */
-
-
-#if (CONFIG_IEC61850_USE_COMPAT_TYPE_DECLARATIONS == 1)
-	,
-    BOOLEAN = 0,/* int */
-    INT8 = 1,   /* int8_t */
-    INT16 = 2,  /* int16_t */
-    INT32 = 3,  /* int32_t */
-    INT64 = 4,  /* int64_t */
-    INT128 = 5, /* no native mapping! */
-    INT8U = 6,  /* uint8_t */
-    INT16U = 7, /* uint16_t */
-    INT24U = 8, /* uint32_t */
-    INT32U = 9, /* uint32_t */
-    FLOAT32 = 10, /* float */
-    FLOAT64 = 11, /* double */
-    ENUMERATED = 12,
-    OCTET_STRING_64 = 13,
-    OCTET_STRING_6 = 14,
-    OCTET_STRING_8 = 15,
-    VISIBLE_STRING_32 = 16,
-    VISIBLE_STRING_64 = 17,
-    VISIBLE_STRING_65 = 18,
-    VISIBLE_STRING_129 = 19,
-    VISIBLE_STRING_255 = 20,
-    UNICODE_STRING_255 = 21,
-    TIMESTAMP = 22,
-    QUALITY = 23,
-    CHECK = 24,
-    CODEDENUM = 25,
-    GENERIC_BITSTRING = 26,
-    CONSTRUCTED = 27,
-    ENTRY_TIME = 28,
-    PHYCOMADDR = 29,
-    CURRENCY = 30
-    OPTFLDS = 31,
-    TRGOPS = 32
-#endif
 } DataAttributeType;
 
 typedef enum {
diff --git a/src/mms/iso_mms/client/mms_client_connection.c b/src/mms/iso_mms/client/mms_client_connection.c
index de7db996..63b50b5f 100644
--- a/src/mms/iso_mms/client/mms_client_connection.c
+++ b/src/mms/iso_mms/client/mms_client_connection.c
@@ -354,10 +354,6 @@ sendMessage(MmsConnection self, ByteBuffer* message)
     }
 #endif /* (CONFIG_MMS_RAW_MESSAGE_LOGGING == 1) */
 
-#if (CONFIG_MMS_COLLECT_STATISTICS == 1)
-    self->statAplMessagesSent++;
-#endif
-
     IsoClientConnection_sendMessage(self->isoClient, message);
 }