cleanup code to match the rest of the project standards;

pull/25/head
Bryan Biedenkapp 3 years ago
parent ad5fc27783
commit f36426a889

@ -301,4 +301,16 @@ namespace nxdn
} // namespace nxdn } // namespace nxdn
// ---------------------------------------------------------------------------
// Namespace Prototypes
// ---------------------------------------------------------------------------
namespace edac { }
namespace nxdn
{
namespace edac
{
using namespace ::edac;
} // namespace edac
} // namespace nxdn
#endif // __NXDN_DEFINES_H__ #endif // __NXDN_DEFINES_H__

@ -224,7 +224,7 @@ bool CAC::decode(const uint8_t* data)
#endif #endif
// check CRC-16 // check CRC-16
bool ret = ::edac::CRC::checkCRC16(m_data, NXDN_CAC_SHORT_LENGTH_BITS); bool ret = edac::CRC::checkCRC16(m_data, NXDN_CAC_SHORT_LENGTH_BITS);
if (!ret) { if (!ret) {
LogError(LOG_NXDN, "CAC::decode(), failed CRC-6 check"); LogError(LOG_NXDN, "CAC::decode(), failed CRC-6 check");
return false; return false;
@ -271,7 +271,7 @@ void CAC::encode(uint8_t* data) const
WRITE_BIT(buffer, i, b); WRITE_BIT(buffer, i, b);
} }
uint16_t crc = ::edac::CRC::addCRC16(buffer, NXDN_CAC_LENGTH_BITS); uint16_t crc = edac::CRC::addCRC16(buffer, NXDN_CAC_LENGTH_BITS);
#if DEBUG_NXDN_CAC #if DEBUG_NXDN_CAC
Utils::dump(2U, "Encoded CAC", buffer, NXDN_CAC_FEC_LENGTH_BYTES); Utils::dump(2U, "Encoded CAC", buffer, NXDN_CAC_FEC_LENGTH_BYTES);

@ -171,7 +171,7 @@ bool FACCH1::decode(const uint8_t* data, uint32_t offset)
#endif #endif
// check CRC-12 // check CRC-12
bool ret = ::edac::CRC::checkCRC12(m_data, NXDN_FACCH1_LENGTH_BITS); bool ret = edac::CRC::checkCRC12(m_data, NXDN_FACCH1_LENGTH_BITS);
if (!ret) { if (!ret) {
LogError(LOG_NXDN, "FACCH1::decode(), failed CRC-12 check"); LogError(LOG_NXDN, "FACCH1::decode(), failed CRC-12 check");
return false; return false;
@ -193,7 +193,7 @@ void FACCH1::encode(uint8_t* data, uint32_t offset) const
::memset(buffer, 0x00U, NXDN_FACCH1_CRC_LENGTH_BYTES); ::memset(buffer, 0x00U, NXDN_FACCH1_CRC_LENGTH_BYTES);
::memcpy(buffer, m_data, NXDN_FACCH1_CRC_LENGTH_BYTES - 2U); ::memcpy(buffer, m_data, NXDN_FACCH1_CRC_LENGTH_BYTES - 2U);
::edac::CRC::addCRC12(buffer, NXDN_FACCH1_LENGTH_BITS); edac::CRC::addCRC12(buffer, NXDN_FACCH1_LENGTH_BITS);
#if DEBUG_NXDN_FACCH1 #if DEBUG_NXDN_FACCH1
Utils::dump(2U, "Encoded FACCH1", buffer, NXDN_FACCH1_CRC_LENGTH_BYTES); Utils::dump(2U, "Encoded FACCH1", buffer, NXDN_FACCH1_CRC_LENGTH_BYTES);

@ -173,7 +173,7 @@ bool SACCH::decode(const uint8_t* data)
#endif #endif
// check CRC-6 // check CRC-6
bool ret = ::edac::CRC::checkCRC6(m_data, NXDN_SACCH_LENGTH_BITS); bool ret = edac::CRC::checkCRC6(m_data, NXDN_SACCH_LENGTH_BITS);
if (!ret) { if (!ret) {
LogError(LOG_NXDN, "SACCH::decode(), failed CRC-6 check"); LogError(LOG_NXDN, "SACCH::decode(), failed CRC-6 check");
return false; return false;
@ -207,7 +207,7 @@ void SACCH::encode(uint8_t* data) const
WRITE_BIT(buffer, i, b); WRITE_BIT(buffer, i, b);
} }
::edac::CRC::addCRC6(buffer, NXDN_SACCH_LENGTH_BITS); edac::CRC::addCRC6(buffer, NXDN_SACCH_LENGTH_BITS);
#if DEBUG_NXDN_SACCH #if DEBUG_NXDN_SACCH
Utils::dump(2U, "Encoded SACCH", buffer, NXDN_SACCH_CRC_LENGTH_BYTES); Utils::dump(2U, "Encoded SACCH", buffer, NXDN_SACCH_CRC_LENGTH_BYTES);

@ -197,7 +197,7 @@ bool UDCH::decode(const uint8_t* data)
#endif #endif
// check CRC-15 // check CRC-15
bool ret = ::edac::CRC::checkCRC15(m_data, NXDN_UDCH_LENGTH_BITS); bool ret = edac::CRC::checkCRC15(m_data, NXDN_UDCH_LENGTH_BITS);
if (!ret) { if (!ret) {
LogError(LOG_NXDN, "UDCH::decode(), failed CRC-15 check"); LogError(LOG_NXDN, "UDCH::decode(), failed CRC-15 check");
return false; return false;
@ -222,7 +222,7 @@ void UDCH::encode(uint8_t* data) const
::memset(buffer, 0x00U, NXDN_UDCH_CRC_LENGTH_BYTES); ::memset(buffer, 0x00U, NXDN_UDCH_CRC_LENGTH_BYTES);
::memcpy(buffer, m_data, 23U); ::memcpy(buffer, m_data, 23U);
::edac::CRC::addCRC15(buffer, NXDN_UDCH_LENGTH_BITS); edac::CRC::addCRC15(buffer, NXDN_UDCH_LENGTH_BITS);
#if DEBUG_NXDN_UDCH #if DEBUG_NXDN_UDCH
Utils::dump(2U, "Encoded UDCH", m_data, NXDN_UDCH_CRC_LENGTH_BYTES); Utils::dump(2U, "Encoded UDCH", m_data, NXDN_UDCH_CRC_LENGTH_BYTES);

Loading…
Cancel
Save

Powered by TurnKey Linux.