From 27acf348d2b10289f15830fca3bc0fea3dc3f76d Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Fri, 18 Aug 2023 11:09:29 -0400
Subject: [PATCH] better deliniate sections of ControlSignaling classes;

---
 src/dmr/packet/ControlSignaling.cpp  | 8 ++++++++
 src/dmr/packet/ControlSignaling.h    | 8 ++++++++
 src/nxdn/packet/ControlSignaling.cpp | 8 ++++++++
 src/nxdn/packet/ControlSignaling.h   | 8 ++++++++
 src/p25/packet/ControlSignaling.cpp  | 8 ++++++++
 src/p25/packet/ControlSignaling.h    | 8 ++++++++
 6 files changed, 48 insertions(+)

diff --git a/src/dmr/packet/ControlSignaling.cpp b/src/dmr/packet/ControlSignaling.cpp
index a93a83f5..99c29969 100644
--- a/src/dmr/packet/ControlSignaling.cpp
+++ b/src/dmr/packet/ControlSignaling.cpp
@@ -681,6 +681,10 @@ ControlSignaling::~ControlSignaling()
     /* stub */
 }
 
+/*
+** Modem Frame Queuing
+*/
+
 /// <summary>
 /// Helper to write a CSBK packet.
 /// </summary>
@@ -729,6 +733,10 @@ void ControlSignaling::writeRF_CSBK(lc::CSBK* csbk, bool clearBeforeWrite, bool
         m_slot->addFrame(data, false, imm);
 }
 
+/*
+** Control Signalling Logic
+*/
+
 /// <summary>
 /// Helper to write a deny packet.
 /// </summary>
diff --git a/src/dmr/packet/ControlSignaling.h b/src/dmr/packet/ControlSignaling.h
index 51fd84ff..dd0f1918 100644
--- a/src/dmr/packet/ControlSignaling.h
+++ b/src/dmr/packet/ControlSignaling.h
@@ -85,11 +85,19 @@ namespace dmr
             /// <summary>Finalizes a instance of the ControlSignaling class.</summary>
             ~ControlSignaling();
 
+            /*
+            ** Modem Frame Queuing
+            */
+
             /// <summary>Helper to write a immediate CSBK packet.</summary>
             void writeRF_CSBK_Imm(lc::CSBK *csbk) { writeRF_CSBK(csbk, false, true); }
             /// <summary>Helper to write a CSBK packet.</summary>
             void writeRF_CSBK(lc::CSBK* csbk, bool clearBeforeWrite = false, bool imm = false);
 
+            /*
+            ** Control Signalling Logic
+            */
+
             /// <summary>Helper to write a ACK RSP packet.</summary>
             void writeRF_CSBK_ACK_RSP(uint32_t dstId, uint8_t reason, uint8_t responseInfo);
             /// <summary>Helper to write a NACK RSP packet.</summary>
diff --git a/src/nxdn/packet/ControlSignaling.cpp b/src/nxdn/packet/ControlSignaling.cpp
index 5726ed86..f8e23bae 100644
--- a/src/nxdn/packet/ControlSignaling.cpp
+++ b/src/nxdn/packet/ControlSignaling.cpp
@@ -373,6 +373,10 @@ void ControlSignaling::writeNetwork(const uint8_t *data, uint32_t len)
     m_nxdn->m_network->writeNXDN(m_nxdn->m_rfLC, data, len);
 }
 
+/*
+** Modem Frame Queuing
+*/
+
 /// <summary>
 /// Helper to write a single-block RCCH packet.
 /// </summary>
@@ -430,6 +434,10 @@ void ControlSignaling::writeRF_Message(RCCH* rcch, bool noNetwork, bool clearBef
     }
 }
 
+/*
+** Control Signalling Logic
+*/
+
 /// <summary>
 /// Helper to write control channel packet data.
 /// </summary>
diff --git a/src/nxdn/packet/ControlSignaling.h b/src/nxdn/packet/ControlSignaling.h
index e0407cb1..d7967c53 100644
--- a/src/nxdn/packet/ControlSignaling.h
+++ b/src/nxdn/packet/ControlSignaling.h
@@ -94,11 +94,19 @@ namespace nxdn
             /// <summary>Write data processed from RF to the network.</summary>
             void writeNetwork(const uint8_t* data, uint32_t len);
 
+            /*
+            ** Modem Frame Queuing
+            */
+
             /// <summary>Helper to write a immediate single-block RCCH packet.</summary>
             void writeRF_Message_Imm(lc::RCCH *rcch, bool noNetwork) { writeRF_Message(rcch, noNetwork, false, true); }
             /// <summary>Helper to write a single-block RCCH packet.</summary>
             void writeRF_Message(lc::RCCH* rcch, bool noNetwork, bool clearBeforeWrite = false, bool imm = false);
 
+            /*
+            ** Control Signalling Logic
+            */
+
             /// <summary>Helper to write control channel packet data.</summary>
             void writeRF_ControlData(uint8_t frameCnt, uint8_t n, bool adjSS);
 
diff --git a/src/p25/packet/ControlSignaling.cpp b/src/p25/packet/ControlSignaling.cpp
index 439452d0..23d09c0f 100644
--- a/src/p25/packet/ControlSignaling.cpp
+++ b/src/p25/packet/ControlSignaling.cpp
@@ -1301,6 +1301,10 @@ void ControlSignaling::writeNetworkRF(lc::TDULC* tduLc, const uint8_t* data, boo
         m_p25->m_network->resetP25();
 }
 
+/*
+** Modem Frame Queuing
+*/
+
 /// <summary>
 /// Helper to write a P25 TDU w/ link control packet.
 /// </summary>
@@ -1654,6 +1658,10 @@ void ControlSignaling::writeRF_TSDU_AMBT(lc::AMBT* ambt, bool clearBeforeWrite)
     m_p25->m_data->writeRF_PDU_User(header, pduUserData, clearBeforeWrite);
 }
 
+/*
+** Control Signalling Logic
+*/
+
 /// <summary>
 /// Helper to write a P25 TDU w/ link control channel release packet.
 /// </summary>
diff --git a/src/p25/packet/ControlSignaling.h b/src/p25/packet/ControlSignaling.h
index a5be1766..4ea30c86 100644
--- a/src/p25/packet/ControlSignaling.h
+++ b/src/p25/packet/ControlSignaling.h
@@ -164,6 +164,10 @@ namespace p25
             /// <summary>Write data processed from RF to the network.</summary>
             void writeNetworkRF(lc::TDULC* tduLc, const uint8_t* data, bool autoReset);
 
+            /*
+            ** Modem Frame Queuing
+            */
+
             /// <summary>Helper to write a P25 TDU w/ link control packet.</summary>
             virtual void writeRF_TDULC(lc::TDULC* lc, bool noNetwork);
             /// <summary>Helper to write a network P25 TDU w/ link control packet.</summary>
@@ -180,6 +184,10 @@ namespace p25
             /// <summary>Helper to write a alternate multi-block ControlSignalinging PDU packet.</summary>
             virtual void writeRF_TSDU_AMBT(lc::AMBT* ambt, bool clearBeforeWrite = false);
 
+            /*
+            ** Control Signalling Logic
+            */
+
             /// <summary>Helper to write a P25 TDU w/ link control channel release packet.</summary>
             void writeRF_TDULC_ChanRelease(bool grp, uint32_t srcId, uint32_t dstId);