MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-02-20 20:31:26 +00:00
parent 8290db81fd
commit 4b2df6150f
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
NXDNAudio.cpp
View File

@@ -498,18 +498,13 @@ void CNXDNAudio::decode(const unsigned char* in, unsigned char* out, unsigned in
MASK >>= 1; MASK >>= 1;
} }
bool b24 = (b & 0x01U) == 0x01U;
unsigned int data = CGolay24128::decode24128(a); unsigned int data = CGolay24128::decode24128(a);
// The PRNG // The PRNG
unsigned int p = PRNG_TABLE[data]; unsigned int p = PRNG_TABLE[data];
b ^= p; b ^= p;
unsigned int datb = CGolay24128::decode24128(b);
datb &= 0xFFFFFEU; unsigned int datb = CGolay24128::decode24128(b);
datb |= b24 ? 0x01U : 0x00U;
MASK = 0x000800U; MASK = 0x000800U;
for (unsigned int i = 0U; i < 12U; i++) { for (unsigned int i = 0U; i < 12U; i++) {
@@ -564,18 +559,14 @@ void CNXDNAudio::encode(const unsigned char* in, unsigned char* out, unsigned in
MASK >>= 1; MASK >>= 1;
} }
bool b24 = (cOrig & 0x1000000U) == 0x1000000U; unsigned int a = CGolay24128::encode24128(aOrig);
// The PRNG // The PRNG
unsigned int p = PRNG_TABLE[aOrig]; unsigned int p = PRNG_TABLE[aOrig];
unsigned int a = CGolay24128::encode24128(aOrig);
unsigned int b = CGolay24128::encode24128(bOrig); unsigned int b = CGolay24128::encode24128(bOrig);
unsigned int c = cOrig;
b ^= p; b ^= p;
b &= 0xFFFFFEU;
b |= b24 ? 0x01U : 0x00U; unsigned int c = cOrig;
MASK = 0x800000U; MASK = 0x800000U;
for (unsigned int i = 0U; i < 24U; i++) { for (unsigned int i = 0U; i < 24U; i++) {

2
NXDNControl.cpp
View File

@@ -773,8 +773,8 @@ void CNXDNControl::writeNetwork()
m_netFrames = 1U; m_netFrames = 1U;
m_netLost = 0U; m_netLost = 0U;
} else { } else {
m_netFrames++;
CUtils::dump(2U, "NXDN, interesting non superblock network frame", netData, 33U); CUtils::dump(2U, "NXDN, interesting non superblock network frame", netData, 33U);
return;
} }
} else { } else {
if (m_netState == RS_NET_IDLE) { if (m_netState == RS_NET_IDLE) {