From 94e28c2c3a8b19fef4ff6c9ebf67b35b8a346ec7 Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Wed, 7 Sep 2022 12:24:54 -0400
Subject: [PATCH] code cleanup;

---
 p25/lc/TSBK.cpp      | 25 +++++++++++++------------
 p25/packet/Trunk.cpp | 15 ++++++++-------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/p25/lc/TSBK.cpp b/p25/lc/TSBK.cpp
index af3995da..bb79a14e 100644
--- a/p25/lc/TSBK.cpp
+++ b/p25/lc/TSBK.cpp
@@ -896,8 +896,8 @@ void TSBK::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
     {
         //Setup
         std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-        time_t tt = std::chrono::system_clock::to_time_t( now );
-        tm local_tm = *gmtime( &tt );
+        time_t tt = std::chrono::system_clock::to_time_t(now);
+        tm local_tm = *gmtime(&tt);
         unsigned long tmM = 0b000;
         unsigned long tmMDAY = 0b00000;
         uint32_t tmY = 0b0000000000000;
@@ -950,18 +950,19 @@ void TSBK::encode(uint8_t* data, bool rawTSBK, bool noTrellis)
         tsbkValue = tsbkValue + tmS;
 
 #if DEBUG_P25_TSBK
-        LogError(LOG_P25 , "TSBK_OSP_TIME_DATE_ANN (Dump Start)");
-        LogError(LOG_P25 , "tsbkValue RAW= $%p" , tsbkValue);
-        LogError(LOG_P25 , "tmM= $%p" , tmM);
-        LogError(LOG_P25 , "tmMDAY= $%p" , tmMDAY);
-        LogError(LOG_P25 , "tmY= $%p" , tmY);
-        LogError(LOG_P25 , "tmH= $%p" , tmH);
-        LogError(LOG_P25 , "tmMin= $%p" , tmMin);
-        LogError(LOG_P25 , "tmS= $%p" , tmS);
-        LogError(LOG_P25 , "TSBK_OSP_TIME_DATE_ANN (Dump End)");
+        LogError(LOG_P25, "TSBK_OSP_TIME_DATE_ANN (Dump Start)");
+        LogError(LOG_P25, "tsbkValue RAW= $%p" , tsbkValue);
+        LogError(LOG_P25, "tmM= $%p" , tmM);
+        LogError(LOG_P25, "tmMDAY= $%p" , tmMDAY);
+        LogError(LOG_P25, "tmY= $%p" , tmY);
+        LogError(LOG_P25, "tmH= $%p" , tmH);
+        LogError(LOG_P25, "tmMin= $%p" , tmMin);
+        LogError(LOG_P25, "tmS= $%p" , tmS);
+        LogError(LOG_P25, "TSBK_OSP_TIME_DATE_ANN (Dump End)");
 #endif
 
-    }break;
+    }
+    break;
     default:
         if (m_mfId == P25_MFG_STANDARD) {
             LogError(LOG_P25, "TSBK::encode(), unknown TSBK LCO value, mfId = $%02X, lco = $%02X", m_mfId, m_lco);
diff --git a/p25/packet/Trunk.cpp b/p25/packet/Trunk.cpp
index 29e5ec1e..e62d4d9f 100644
--- a/p25/packet/Trunk.cpp
+++ b/p25/packet/Trunk.cpp
@@ -1834,6 +1834,14 @@ void Trunk::queueRF_TSBK_Ctrl(uint8_t lco)
             // transmit SNDCP announcement
             m_rfTSBK.setLCO(TSBK_OSP_SNDCP_CH_ANN);
             break;
+        case TSBK_OSP_TIME_DATE_ANN:
+            if (m_debug) {
+                LogMessage(LOG_RF , P25_TSDU_STR ", TSBK_OSP_TIME_DATE_ANN (Time Date Announce)");
+            }
+            
+            m_rfTSBK.setLCO(TSBK_OSP_TIME_DATE_ANN);
+            m_rfTSBK.setMFId(P25_MFG_STANDARD);
+            break;
 
         /** Motorola CC data */
         case TSBK_OSP_MOT_PSH_CCH:
@@ -1866,13 +1874,6 @@ void Trunk::queueRF_TSBK_Ctrl(uint8_t lco)
             m_rfTSBK.setLCO(TSBK_OSP_DVM_GIT_HASH);
             m_rfTSBK.setMFId(P25_MFG_DVM);
             break;
-        case TSBK_OSP_TIME_DATE_ANN:
-            if ( m_debug ) {
-                LogMessage(LOG_RF , P25_TSDU_STR ", TSBK_OSP_TIME_DATE_ANN (Time Date Announce)");
-            }
-            m_rfTSBK.setLCO( TSBK_OSP_TIME_DATE_ANN );
-            m_rfTSBK.setMFId( P25_MFG_STANDARD );
-            break;
     }
 
     m_rfTSBK.setLastBlock(true); // always set last block