From 8f0e0dacada0e0ecd3bb84bc7528890363018acd Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Thu, 19 Jul 2018 23:28:17 -0400
Subject: [PATCH] Some code cleanup

---
 BitRB.cpp    |  2 +-
 DMRDMOTX.cpp |  4 ++--
 Globals.h    |  3 ---
 IO.cpp       |  4 ++--
 POCSAGTX.cpp | 21 +++++++++------------
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/BitRB.cpp b/BitRB.cpp
index 1f23b17..4ba8efb 100644
--- a/BitRB.cpp
+++ b/BitRB.cpp
@@ -25,7 +25,7 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
 
 #define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
 #define READ_BIT1(p,i)    ((p[(i)>>3] & BIT_MASK_TABLE[(i)&7]) >> (7 - ((i)&7)))
- 
+
 CBitRB::CBitRB(uint16_t length) :
 m_length(length),
 m_bits(NULL),
diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp
index bfc02c0..30df87d 100644
--- a/DMRDMOTX.cpp
+++ b/DMRDMOTX.cpp
@@ -77,10 +77,10 @@ void CDMRDMOTX::process()
         m_poPtr++;
         writeByte(DMR_SYNC);
       } else
-        writeByte(m_poBuffer[m_poPtr++]);   
+          writeByte(m_poBuffer[m_poPtr++]);   
 
       space -= 8U;
-      
+
       if (m_poPtr >= m_poLen) {
         m_poPtr = 0U;
         m_poLen = 0U;
diff --git a/Globals.h b/Globals.h
index a6bcd37..419417c 100644
--- a/Globals.h
+++ b/Globals.h
@@ -83,9 +83,6 @@ const uint8_t  MARK_NONE  = 0x00U;
 #include "Debug.h"
 #include "Utils.h"
 
-const uint16_t TX_RINGBUFFER_SIZE = 1024U;
-const uint16_t RX_RINGBUFFER_SIZE = 1024U;
-
 extern MMDVM_STATE m_modemState;
 extern MMDVM_STATE m_calState;
 extern MMDVM_STATE m_modemState_prev;
diff --git a/IO.cpp b/IO.cpp
index 0b0d26c..8a76d4d 100644
--- a/IO.cpp
+++ b/IO.cpp
@@ -29,8 +29,8 @@ uint8_t     m_power;
 
 CIO::CIO():
 m_started(false),
-m_rxBuffer(RX_RINGBUFFER_SIZE),
-m_txBuffer(TX_RINGBUFFER_SIZE),
+m_rxBuffer(1024U),
+m_txBuffer(1024U),
 m_LoDevYSF(false),
 m_ledCount(0U),
 m_scanEnable(false),
diff --git a/POCSAGTX.cpp b/POCSAGTX.cpp
index 9d8f389..f4bdfe3 100644
--- a/POCSAGTX.cpp
+++ b/POCSAGTX.cpp
@@ -34,35 +34,32 @@ m_delay(false)
 
 void CPOCSAGTX::process()
 {
-  if (m_buffer.getData() == 0U && m_poLen == 0U)
-    return;
-
-  if (m_poLen == 0U) {
+  if (m_poLen == 0U && m_buffer.getData() > 0U) {
     if (!m_tx) {
       m_delay = true;
       m_poLen = m_txDelay;
     } else {
       m_delay = false;
       for (uint8_t i = 0U; i < POCSAG_FRAME_LENGTH_BYTES; i++)
-        m_poBuffer[m_poLen++] = m_buffer.get();
-    }
+        m_poBuffer[i] = m_buffer.get();
 
+      m_poLen = POCSAG_FRAME_LENGTH_BYTES;
+    }
     m_poPtr = 0U;
   }
 
   if (m_poLen > 0U) {
     uint16_t space = io.getSpace();
-    
+
     while (space > 8U) {
       if (m_delay) {
         m_poPtr++;
         writeByte(POCSAG_SYNC);
-      }
-      else
-        writeByte(m_poBuffer[m_poPtr++]); 
+      } else
+          writeByte(m_poBuffer[m_poPtr++]); 
 
       space -= 8U;
-      
+
       if (m_poPtr >= m_poLen) {
         m_poPtr = 0U;
         m_poLen = 0U;
@@ -92,7 +89,7 @@ void CPOCSAGTX::writeByte(uint8_t c)
 {
   uint8_t bit;
   uint8_t mask = 0x80U;
-  
+
   for (uint8_t i = 0U; i < 8U; i++, c <<= 1) {
     if ((c & mask) == mask)
       bit = 1U;