From 4c80f52131198f1b23bd349cbc6de4df2f101f37 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 29 Mar 2016 18:06:17 +0100
Subject: [PATCH] Standardise the number of headers transmitted.

---
 DMRIPSC.cpp |  2 +-
 DMRSlot.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/DMRIPSC.cpp b/DMRIPSC.cpp
index 0d0ba94..a8d9727 100644
--- a/DMRIPSC.cpp
+++ b/DMRIPSC.cpp
@@ -248,7 +248,7 @@ bool CDMRIPSC::write(const CDMRData& data)
 	} else {
 		if (dataType == DT_VOICE_LC_HEADER) {
 			m_streamId[slotIndex] = ::rand() + 1U;
-			count = 3U;
+			count = 2U;
 		}
 
 		if (dataType == DT_CSBK || dataType == DT_DATA_HEADER) {
diff --git a/DMRSlot.cpp b/DMRSlot.cpp
index da029f1..28c4022 100644
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@@ -151,8 +151,8 @@ void CDMRSlot::writeModem(unsigned char *data)
 			m_rfErrs   = 0U;
 
 			if (m_duplex) {
-				for (unsigned i = 0U; i < 3U; i++)
-					writeQueueRF(data);
+				writeQueueRF(data);
+				writeQueueRF(data);
 			}
 
 			writeNetworkRF(data, DT_VOICE_LC_HEADER);
@@ -205,8 +205,8 @@ void CDMRSlot::writeModem(unsigned char *data)
 			data[0U] = TAG_EOT;
 			data[1U] = 0x00U;
 
-			for (unsigned int i = 0U; i < 2U; i++)
-				writeNetworkRF(data, DT_TERMINATOR_WITH_LC);
+			writeNetworkRF(data, DT_TERMINATOR_WITH_LC);
+			writeNetworkRF(data, DT_TERMINATOR_WITH_LC);
 
 			// 480ms of terminator to space things out
 			if (m_duplex) {
@@ -484,8 +484,8 @@ void CDMRSlot::writeModem(unsigned char *data)
 				m_rfErrs   = 0U;
 
 				if (m_duplex) {
-					for (unsigned int i = 0U; i < 3U; i++)
-						writeQueueRF(start);
+					writeQueueRF(start);
+					writeQueueRF(start);
 				}
 
 				writeNetworkRF(start, DT_VOICE_LC_HEADER);
@@ -690,8 +690,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 		for (unsigned int i = 0U; i < 5U; i++)
 			writeQueueNet(m_idle);
 
-		for (unsigned int i = 0U; i < 3U; i++)
-			writeQueueNet(data);
+		writeQueueNet(data);
+		writeQueueNet(data);
 
 		m_netState = RS_NET_AUDIO;