From 4ec99becfe3cfc234570d5004dcf5c53e96649ee Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Fri, 24 Mar 2023 19:09:08 -0400
Subject: [PATCH] change DVM MFId to the officially assigned value of $9C
 (Omaha Communication Systems);

---
 src/dmr/DMRDefines.h                     | 2 +-
 src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp    | 2 +-
 src/p25/P25Defines.h                     | 2 +-
 src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp     | 2 +-
 src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp | 2 +-
 src/p25/lc/tsbk/TSBKFactory.cpp          | 6 +++---
 src/p25/packet/Trunk.cpp                 | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/dmr/DMRDefines.h b/src/dmr/DMRDefines.h
index bdfe0f28..82c6fd2d 100644
--- a/src/dmr/DMRDefines.h
+++ b/src/dmr/DMRDefines.h
@@ -173,7 +173,7 @@ namespace dmr
     // Feature IDs
     const uint8_t   FID_ETSI = 0x00U;                       // ETSI Standard Feature Set
     const uint8_t   FID_DMRA = 0x10U;                       //
-    const uint8_t   FID_DVM = 0x3FU;                        // internal DMR FID used for internal signalling
+    const uint8_t   FID_OCS_DVM = 0x9CU;                    // FID used for internal signalling; Omaha Communication Systems, LLC ($9C)
 
     // LC Service Options
     const uint8_t   LC_SVC_OPT_EMERGENCY = 0x80U;
diff --git a/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp b/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp
index bb72d534..4a78a088 100644
--- a/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp
+++ b/src/dmr/lc/csbk/CSBK_DVM_GIT_HASH.cpp
@@ -46,7 +46,7 @@ using namespace dmr;
 CSBK_DVM_GIT_HASH::CSBK_DVM_GIT_HASH() : CSBK()
 {
     m_CSBKO = CSBKO_DVM_GIT_HASH;
-    m_FID = FID_DVM;
+    m_FID = FID_OCS_DVM;
 }
 
 /// <summary>
diff --git a/src/p25/P25Defines.h b/src/p25/P25Defines.h
index 5406c6e2..3c52496a 100644
--- a/src/p25/P25Defines.h
+++ b/src/p25/P25Defines.h
@@ -113,7 +113,7 @@ namespace p25
 
     const uint8_t   P25_MFG_STANDARD = 0x00U;
     const uint8_t   P25_MFG_MOT = 0x90U;
-    const uint8_t   P25_MFG_DVM = 0xFEU; // internal P25 MFId used for internal signalling
+    const uint8_t   P25_MFG_DVM_OCS = 0x9CU;                // P25 MFId used for internal signalling; Omaha Communication Systems, LLC ($9C)
 
     const uint8_t   P25_MOT_CALLSIGN_LENGTH_BYTES = 8U;
 
diff --git a/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp b/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp
index 28bbc41a..5d84b3b3 100644
--- a/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp
+++ b/src/p25/lc/tsbk/OSP_DVM_GIT_HASH.cpp
@@ -46,7 +46,7 @@ using namespace p25;
 OSP_DVM_GIT_HASH::OSP_DVM_GIT_HASH() : TSBK()
 {
     m_lco = TSBK_OSP_DVM_GIT_HASH;
-    m_mfId = P25_MFG_DVM;
+    m_mfId = P25_MFG_DVM_OCS;
 }
 
 /// <summary>
diff --git a/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp b/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp
index 13b7ebe3..accf1c0f 100644
--- a/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp
+++ b/src/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.cpp
@@ -45,7 +45,7 @@ using namespace p25;
 OSP_DVM_LC_CALL_TERM::OSP_DVM_LC_CALL_TERM() : TSBK()
 {
     m_lco = LC_CALL_TERM;
-    m_mfId = P25_MFG_DVM;
+    m_mfId = P25_MFG_DVM_OCS;
 }
 
 /// <summary>
diff --git a/src/p25/lc/tsbk/TSBKFactory.cpp b/src/p25/lc/tsbk/TSBKFactory.cpp
index b4d9d7b8..5625d5f0 100644
--- a/src/p25/lc/tsbk/TSBKFactory.cpp
+++ b/src/p25/lc/tsbk/TSBKFactory.cpp
@@ -167,8 +167,8 @@ std::unique_ptr<TSBK> TSBKFactory::createTSBK(const uint8_t* data, bool rawTSBK)
         }
     }
 
-    // internal P25 vendor opcodes
-    if (mfId == P25_MFG_DVM) {
+    // internal / Omaha Communication Systems P25 vendor opcodes
+    if (mfId == P25_MFG_DVM_OCS) {
         switch (lco) {
         case LC_CALL_TERM:
             return decode(new OSP_DVM_LC_CALL_TERM(), data, rawTSBK);
@@ -177,7 +177,7 @@ std::unique_ptr<TSBK> TSBKFactory::createTSBK(const uint8_t* data, bool rawTSBK)
             break;
         }
 
-        if (mfId == P25_MFG_DVM) {
+        if (mfId == P25_MFG_DVM_OCS) {
             return nullptr;
         }
         else {
diff --git a/src/p25/packet/Trunk.cpp b/src/p25/packet/Trunk.cpp
index 72d48328..d80904fd 100644
--- a/src/p25/packet/Trunk.cpp
+++ b/src/p25/packet/Trunk.cpp
@@ -669,8 +669,8 @@ bool Trunk::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
                 uint32_t srcId = tsbk->getSrcId();
                 uint32_t dstId = tsbk->getDstId();
 
-                // handle internal DVM TSDUs
-                if (tsbk->getMFId() == P25_MFG_DVM) {
+                // handle internal / Omaha Communication Systems DVM TSDUs
+                if (tsbk->getMFId() == P25_MFG_DVM_OCS) {
                     switch (tsbk->getLCO()) {
                         case LC_CALL_TERM:
                         {