Not happy about LICH reconstruction, remove it.
This commit is contained in:
parent
a5c61daa73
commit
ff71383ac7
|
@ -158,16 +158,16 @@ bool CNXDNControl::writeModem(unsigned char *data, unsigned int len)
|
||||||
if (usc == NXDN_LICH_USC_UDCH)
|
if (usc == NXDN_LICH_USC_UDCH)
|
||||||
ret = processData(option, data);
|
ret = processData(option, data);
|
||||||
else
|
else
|
||||||
ret = processVoice(valid, usc, option, data);
|
ret = processVoice(usc, option, data);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CNXDNControl::processVoice(bool validLICH, unsigned char usc, unsigned char option, unsigned char *data)
|
bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigned char *data)
|
||||||
{
|
{
|
||||||
CNXDNSACCH sacch;
|
CNXDNSACCH sacch;
|
||||||
bool validSACCH = sacch.decode(data + 2U);
|
bool valid = sacch.decode(data + 2U);
|
||||||
if (validSACCH) {
|
if (valid) {
|
||||||
unsigned char ran = sacch.getRAN();
|
unsigned char ran = sacch.getRAN();
|
||||||
if (ran != m_ran && ran != 0U)
|
if (ran != m_ran && ran != 0U)
|
||||||
return false;
|
return false;
|
||||||
|
@ -175,22 +175,6 @@ bool CNXDNControl::processVoice(bool validLICH, unsigned char usc, unsigned char
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reconstruct invalid LICH
|
|
||||||
if (!validLICH) {
|
|
||||||
if (usc == NXDN_LICH_USC_SACCH_NS) {
|
|
||||||
option = NXDN_LICH_STEAL_NONE;
|
|
||||||
usc = NXDN_LICH_USC_SACCH_SS;
|
|
||||||
} else {
|
|
||||||
if (option == NXDN_LICH_STEAL_FACCH)
|
|
||||||
option = NXDN_LICH_STEAL_NONE;
|
|
||||||
else if (option == NXDN_LICH_STEAL_NONE)
|
|
||||||
option = NXDN_LICH_STEAL_FACCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_rfLastLICH.setFCT(usc);
|
|
||||||
m_rfLastLICH.setOption(option);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (usc == NXDN_LICH_USC_SACCH_NS) {
|
if (usc == NXDN_LICH_USC_SACCH_NS) {
|
||||||
// The SACCH on a non-superblock frame is usually an idle and not interesting apart from the RAN.
|
// The SACCH on a non-superblock frame is usually an idle and not interesting apart from the RAN.
|
||||||
CNXDNFACCH1 facch;
|
CNXDNFACCH1 facch;
|
||||||
|
|
|
@ -81,7 +81,7 @@ private:
|
||||||
unsigned int m_rssiCount;
|
unsigned int m_rssiCount;
|
||||||
FILE* m_fp;
|
FILE* m_fp;
|
||||||
|
|
||||||
bool processVoice(bool validLICH, unsigned char usc, unsigned char option, unsigned char *data);
|
bool processVoice(unsigned char usc, unsigned char option, unsigned char *data);
|
||||||
bool processData(unsigned char option, unsigned char *data);
|
bool processData(unsigned char option, unsigned char *data);
|
||||||
|
|
||||||
void writeQueueRF(const unsigned char* data);
|
void writeQueueRF(const unsigned char* data);
|
||||||
|
|
Loading…
Reference in a new issue