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

Revert "Rework the LICH parity."

Browse Source 
This reverts commit 5a22b3d0a6.
This commit is contained in:
Jonathan Naylor
2018-03-20 20:36:23 +00:00
parent 5a22b3d0a6
commit 5b45767fea
3 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
NXDNLICH.cpp
View File

@@ -18,7 +18,6 @@
#include "NXDNDefines.h"
#include "NXDNLICH.h"
#include "NXDNCRC.h"
#include <cstdio>
#include <cassert>
@@ -51,26 +50,37 @@ bool CNXDNLICH::decode(const unsigned char* bytes)
{
assert(bytes != NULL);
unsigned int offset = NXDN_FSW_LENGTH_BITS;
for (unsigned int i = 0U; i < (NXDN_LICH_LENGTH_BITS / 2U); i++, offset += 2U) {
bool b = READ_BIT1(bytes, offset);
WRITE_BIT1(m_lich, i, b);
bool b[8U];
unsigned int offset1 = NXDN_FSW_LENGTH_BITS;
unsigned int offset2 = 7U;
for (unsigned int i = 0U; i < (NXDN_LICH_LENGTH_BITS / 2U); i++, offset1 += 2U, offset2--) {
b[offset2] = READ_BIT1(bytes, offset1);
WRITE_BIT1(m_lich, i, b[offset2]);
}
return CNXDNCRC::checkLICHParity(m_lich[0U]);
bool parity = b[7U] ^ b[6U] ^ b[5U] ^ b[4U];
if (parity != b[0U])
return false;
return true;
}
void CNXDNLICH::encode(unsigned char* bytes)
{
assert(bytes != NULL);
CNXDNCRC::encodeLICHParity(m_lich[0U]);
bool b[8U];
unsigned int offset = 7U;
for (unsigned int i = 0U; i < (NXDN_LICH_LENGTH_BITS / 2U); i++, offset--)
b[offset] = READ_BIT1(m_lich, i);
b[0U] = b[7U] ^ b[6U] ^ b[5U] ^ b[4U];
unsigned int offset1 = NXDN_FSW_LENGTH_BITS;
unsigned int offset2 = 7U;
for (unsigned int i = 0U; i < (NXDN_LICH_LENGTH_BITS / 2U); i++, offset2--) {
bool b = READ_BIT1(m_lich, offset2);
WRITE_BIT1(bytes, offset1, b);
WRITE_BIT1(bytes, offset1, b[offset2]);
offset1++;
WRITE_BIT1(bytes, offset1, true);
offset1++;
@@ -99,8 +109,6 @@ unsigned char CNXDNLICH::getDirection() const
unsigned char CNXDNLICH::getRaw() const
{
CNXDNCRC::encodeLICHParity(m_lich[0U]);
return m_lich[0U];
}
@@ -119,7 +127,7 @@ void CNXDNLICH::setFCT(unsigned char usc)
void CNXDNLICH::setOption(unsigned char option)
{
m_lich[0U] &= 0xF3U;
m_lich[0U] |= (option << 2) & 0x0CU;
m_lich[0u] |= (option << 2) & 0x0CU;
}
void CNXDNLICH::setDirection(unsigned char direction)