From 2d670d330bcc9d2ec2ad2b7108e89b3db7a01308 Mon Sep 17 00:00:00 2001 From: Tony Corbett G0WFV Date: Wed, 7 Jun 2017 10:38:53 +0100 Subject: [PATCH] Alter rewrite ranges so they appear correctly in tracing --- RewritePC.cpp | 4 ++-- RewriteSrc.cpp | 4 ++-- RewriteTG.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RewritePC.cpp b/RewritePC.cpp index b4f6246..f3fb65a 100644 --- a/RewritePC.cpp +++ b/RewritePC.cpp @@ -29,7 +29,7 @@ CRewritePC::CRewritePC(const char* name, unsigned int fromSlot, unsigned int fro m_name(name), m_fromSlot(fromSlot), m_fromIdStart(fromId), -m_fromIdEnd(fromId + range), +m_fromIdEnd(fromId + range - 1U), m_toSlot(toSlot), m_toIdStart(toId), m_trace(trace), @@ -70,7 +70,7 @@ bool CRewritePC::process(CDMRData& data) unsigned int dstId = data.getDstId(); unsigned int slotNo = data.getSlotNo(); - if (flco != FLCO_USER_USER || slotNo != m_fromSlot || dstId < m_fromIdStart || dstId >= m_fromIdEnd) + if (flco != FLCO_USER_USER || slotNo != m_fromSlot || dstId < m_fromIdStart || dstId > m_fromIdEnd) return false; if (m_fromSlot != m_toSlot) diff --git a/RewriteSrc.cpp b/RewriteSrc.cpp index 5b470fe..71541fc 100644 --- a/RewriteSrc.cpp +++ b/RewriteSrc.cpp @@ -29,7 +29,7 @@ CRewriteSrc::CRewriteSrc(const char* name, unsigned int fromSlot, unsigned int f m_name(name), m_fromSlot(fromSlot), m_fromIdStart(fromId), -m_fromIdEnd(fromId + range), +m_fromIdEnd(fromId + range - 1U), m_toSlot(toSlot), m_toTG(toTG), m_trace(trace), @@ -72,7 +72,7 @@ bool CRewriteSrc::process(CDMRData& data) unsigned int srcId = data.getSrcId(); unsigned int slotNo = data.getSlotNo(); - if (flco != FLCO_USER_USER || slotNo != m_fromSlot || srcId < m_fromIdStart || srcId >= m_fromIdEnd) + if (flco != FLCO_USER_USER || slotNo != m_fromSlot || srcId < m_fromIdStart || srcId > m_fromIdEnd) return false; if (m_fromSlot != m_toSlot) diff --git a/RewriteTG.cpp b/RewriteTG.cpp index 1b005e9..6c4cfac 100644 --- a/RewriteTG.cpp +++ b/RewriteTG.cpp @@ -29,7 +29,7 @@ CRewriteTG::CRewriteTG(const char* name, unsigned int fromSlot, unsigned int fro m_name(name), m_fromSlot(fromSlot), m_fromTGStart(fromTG), -m_fromTGEnd(fromTG + range), +m_fromTGEnd(fromTG + range - 1U), m_toSlot(toSlot), m_toTGStart(toTG), m_trace(trace), @@ -70,7 +70,7 @@ bool CRewriteTG::process(CDMRData& data) unsigned int dstId = data.getDstId(); unsigned int slotNo = data.getSlotNo(); - if (flco != FLCO_GROUP || slotNo != m_fromSlot || dstId < m_fromTGStart || dstId >= m_fromTGEnd) + if (flco != FLCO_GROUP || slotNo != m_fromSlot || dstId < m_fromTGStart || dstId > m_fromTGEnd) return false; if (m_fromSlot != m_toSlot)