add some extra compilable debug logging information;

src/CMakeLists.txt

@@ -224,6 +224,7 @@ endif (DISABLE_MONITOR)
 option(DEBUG_DMR_PDU_DATA "" off)
 option(DEBUG_CRC "" off)
 option(DEBUG_RS "" off)
+option(DEBUG_AMBEFEC "" off)
 option(DEBUG_MODEM_CAL "" off)
 option(DEBUG_MODEM "" off)
 option(DEBUG_NXDN_FACCH1 "" off)
@@ -255,6 +256,9 @@ endif (DEBUG_CRC_CHECK)
 if (DEBUG_RS)
     add_definitions(-DDEBUG_RS)
 endif (DEBUG_RS)
+if (DEBUG_AMBEFEC)
+    add_definitions(-DDEBUG_AMBEFEC)
+endif (DEBUG_AMBEFEC)
 if (DEBUG_MODEM_CAL)
     add_definitions(-DDEBUG_MODEM_CAL)
 endif (DEBUG_MODEM_CAL)

src/edac/AMBEFEC.cpp

@@ -33,6 +33,7 @@
 #include "edac/AMBEFEC.h"
 #include "edac/Golay24128.h"
 #include "edac/Hamming.h"
+#include "Log.h"
 #include "Utils.h"
 
 using namespace edac;
@@ -611,20 +612,23 @@ uint32_t AMBEFEC::measureNXDNBER(uint8_t* bytes) const
 /// <param name="a"></param>
 /// <param name="b"></param>
 /// <param name="c"></param>
-/// <param name="ignoreParity"></param>
 /// <returns></returns>
-uint32_t AMBEFEC::regenerate(uint32_t& a, uint32_t& b, uint32_t& c, bool ignoreParity) const
+uint32_t AMBEFEC::regenerate(uint32_t& a, uint32_t& b, uint32_t& c) const
 {
     uint32_t old_a = a;
     uint32_t old_b = b;
 
     uint32_t data;
     bool valid = Golay24128::decode24128(a, data);
-	if (!valid && !ignoreParity) {
+    if (!valid) {
+        uint32_t errsA = Utils::countBits32(data ^ a);
+#if DEBUG_AMBEFEC
+        LogDebug(LOG_HOST, "AMBEFEC::regnerate() invalid A block, errsA = %u, a = %6X, b = %6X, c = %6X", errsA, a, b, c);
+#endif
         a = 0xF00292U;
         b = 0x0E0B20U;
         c = 0x000000U;
-		return 10U;		// An invalid A block gives an error count of 10
+        return errsA;
     }
 
     a = Golay24128::encode24128(data);
@@ -643,7 +647,9 @@ uint32_t AMBEFEC::regenerate(uint32_t& a, uint32_t& b, uint32_t& c, bool ignoreP
 
     v = b ^ old_b;
     uint32_t errsB = Utils::countBits32(v);
-
+#if DEBUG_AMBEFEC
+    LogDebug(LOG_HOST, "AMBEFEC::regnerate() errsA = %u, a = %6X, errsB = %u, b = %6X, c = %6X", errsA, a, errsB, b, c);
+#endif
     if (errsA >= 4U || ((errsA + errsB) >= 6U && errsA >= 2U)) {
         a = 0xF00292U;
         b = 0x0E0B20U;

src/edac/AMBEFEC.h

@@ -499,7 +499,7 @@ namespace edac
 
     private:
         /// <summary></summary>
-        uint32_t regenerate(uint32_t& a, uint32_t& b, uint32_t& c, bool ignoreParity = true) const;
+        uint32_t regenerate(uint32_t& a, uint32_t& b, uint32_t& c) const;
     };
 } // namespace edac