From cc24c864847aa0107457bf430ca70a7ac2201f4c Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Sat, 26 May 2018 20:04:07 +0200
Subject: [PATCH] - Fixed to compile with C++

---
 src/iec61850/inc_private/mms_mapping.h        | 14 ++++++--------
 src/iec61850/inc_private/reporting.h          |  4 ++--
 src/iec61850/server/mms_mapping/mms_mapping.c |  2 +-
 src/iec61850/server/mms_mapping/reporting.c   |  6 +++---
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/iec61850/inc_private/mms_mapping.h b/src/iec61850/inc_private/mms_mapping.h
index 5c033535..a97e51d6 100644
--- a/src/iec61850/inc_private/mms_mapping.h
+++ b/src/iec61850/inc_private/mms_mapping.h
@@ -28,13 +28,11 @@
 #include "mms_device_model.h"
 #include "control.h"
 
-typedef enum {
-    REPORT_CONTROL_NONE = 0,
-    REPORT_CONTROL_VALUE_UPDATE = 1,
-    REPORT_CONTROL_VALUE_CHANGED = 2,
-    REPORT_CONTROL_QUALITY_CHANGED = 4,
-    REPORT_CONTROL_NOT_UPDATED = 8
-} ReportInclusionFlag;
+#define REPORT_CONTROL_NONE 0U
+#define REPORT_CONTROL_VALUE_UPDATE 1U
+#define REPORT_CONTROL_VALUE_CHANGED 2U
+#define REPORT_CONTROL_QUALITY_CHANGED 4U
+#define REPORT_CONTROL_NOT_UPDATED 8U
 
 typedef enum {
     LOG_CONTROL_NONE,
@@ -91,7 +89,7 @@ DataSet*
 MmsMapping_createDataSetByNamedVariableList(MmsMapping* self, MmsNamedVariableList variableList);
 
 void
-MmsMapping_triggerReportObservers(MmsMapping* self, MmsValue* value, ReportInclusionFlag flag);
+MmsMapping_triggerReportObservers(MmsMapping* self, MmsValue* value, int flag);
 
 void
 MmsMapping_triggerLogging(MmsMapping* self, MmsValue* value, LogInclusionFlag flag);
diff --git a/src/iec61850/inc_private/reporting.h b/src/iec61850/inc_private/reporting.h
index 2dddb257..b603efd4 100644
--- a/src/iec61850/inc_private/reporting.h
+++ b/src/iec61850/inc_private/reporting.h
@@ -80,7 +80,7 @@ typedef struct {
     Semaphore createNotificationsMutex;  /* { covered by mutex } */
 #endif
 
-    ReportInclusionFlag* inclusionFlags; /* { covered by mutex } */
+    uint8_t* inclusionFlags; /* { covered by mutex } */
     bool triggered;                      /* { covered by mutex } */
     uint64_t reportTime;                 /* { covered by mutex } */
 
@@ -103,7 +103,7 @@ void
 ReportControl_destroy(ReportControl* self);
 
 void
-ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, ReportInclusionFlag flag, bool modelLocked);
+ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, int flag, bool modelLocked);
 
 MmsValue*
 ReportControl_getRCBValue(ReportControl* rc, char* elementName);
diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c
index 957c3429..edb53e4f 100644
--- a/src/iec61850/server/mms_mapping/mms_mapping.c
+++ b/src/iec61850/server/mms_mapping/mms_mapping.c
@@ -2723,7 +2723,7 @@ MmsMapping_triggerLogging(MmsMapping* self, MmsValue* value, LogInclusionFlag fl
 
 #if (CONFIG_IEC61850_REPORT_SERVICE == 1)
 void
-MmsMapping_triggerReportObservers(MmsMapping* self, MmsValue* value, ReportInclusionFlag flag)
+MmsMapping_triggerReportObservers(MmsMapping* self, MmsValue* value, int flag)
 {
     LinkedList element = self->reportControls;
 
diff --git a/src/iec61850/server/mms_mapping/reporting.c b/src/iec61850/server/mms_mapping/reporting.c
index 5edf1504..ce2509c3 100644
--- a/src/iec61850/server/mms_mapping/reporting.c
+++ b/src/iec61850/server/mms_mapping/reporting.c
@@ -662,7 +662,7 @@ updateReportDataset(MmsMapping* mapping, ReportControl* rc, MmsValue* newDatSet,
         if (rc->inclusionFlags != NULL)
             GLOBAL_FREEMEM(rc->inclusionFlags);
 
-        rc->inclusionFlags = (ReportInclusionFlag*) GLOBAL_CALLOC(dataSet->elementCount, sizeof(ReportInclusionFlag));
+        rc->inclusionFlags = (uint8_t*) GLOBAL_CALLOC(dataSet->elementCount, sizeof(uint8_t));
 
         success = true;
 
@@ -2368,7 +2368,7 @@ sendNextReportEntry(ReportControl* self)
 
                 MmsValue_deleteAllBitStringBits(reason);
 
-                switch((ReportInclusionFlag) *currentReportBufferPos) {
+                switch((int) *currentReportBufferPos) {
                 case REPORT_CONTROL_QUALITY_CHANGED:
                     MmsValue_setBitStringBit(reason, 2, true);
                     break;
@@ -2587,7 +2587,7 @@ Reporting_processReportEventsAfterUnlock(MmsMapping* self)
 }
 
 void
-ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, ReportInclusionFlag flag, bool modelLocked)
+ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, int flag, bool modelLocked)
 {
     ReportControl_lockNotify(self);