Remove unused code and fix a small bug in UDCH processing.

This commit is contained in:
Jonathan Naylor
2018-02-14 20:42:18 +00:00
parent 134646265e
commit 971c9b9ad9
5 changed files with 2 additions and 45 deletions

View File

@@ -21,7 +21,6 @@
#include "NXDNConvolution.h"
#include "NXDNDefines.h"
#include "NXDNCRC.h"
#include "Utils.h"
#include <cstdio>
#include <cassert>
@@ -64,8 +63,6 @@ bool CNXDNSACCH::decode(const unsigned char* data)
{
assert(data != NULL);
// CUtils::dump("NXDN, SACCH input", data, 12U);
unsigned char temp1[8U];
for (unsigned int i = 0U; i < NXDN_SACCH_LENGTH_BITS; i++) {
@@ -74,8 +71,6 @@ bool CNXDNSACCH::decode(const unsigned char* data)
WRITE_BIT1(temp1, i, b);
}
// CUtils::dump("NXDN, SACCH de-interleaved", temp1, 8U);
uint8_t temp2[90U];
unsigned int n = 0U;
@@ -107,8 +102,6 @@ bool CNXDNSACCH::decode(const unsigned char* data)
conv.chainback(m_data, 36U);
// CUtils::dump("NXDN, SACCH decoded", m_data, 4U);
return CNXDNCRC::checkCRC6(m_data, 26U);
}
@@ -126,15 +119,11 @@ void CNXDNSACCH::encode(unsigned char* data) const
CNXDNCRC::encodeCRC6(temp1, 26U);
// CUtils::dump("NXDN, SACCH encoded with CRC", temp1, 4U);
unsigned char temp2[9U];
CNXDNConvolution conv;
conv.encode(temp1, temp2, 36U);
// CUtils::dump("NXDN, SACCH convolved", temp2, 9U);
unsigned char temp3[8U];
unsigned int n = 0U;
@@ -149,8 +138,6 @@ void CNXDNSACCH::encode(unsigned char* data) const
}
}
// CUtils::dump("NXDN, SACCH punctured", temp3, 8U);
for (unsigned int i = 0U; i < NXDN_SACCH_LENGTH_BITS; i++) {
unsigned int n = INTERLEAVE_TABLE[i] + NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS;
bool b = READ_BIT1(temp3, i);