diff --git a/DMRDataHeader.cpp b/DMRDataHeader.cpp index 4cb1720..d0127f6 100644 --- a/DMRDataHeader.cpp +++ b/DMRDataHeader.cpp @@ -166,46 +166,6 @@ unsigned int CDMRDataHeader::getBlocks() const return m_blocks; } -void CDMRDataHeader::getTerminator(unsigned char* bytes) const -{ - assert(bytes != NULL); - - unsigned char payload[12U]; - ::memset(payload, 0x00U, 12U); - - payload[0U] = m_GI ? FLCO_GROUP : FLCO_USER_USER; - - payload[1U] = FID_ETSI; - - payload[2U] = (m_dstId >> 16) & 0xFFU; - payload[3U] = (m_dstId >> 8) & 0xFFU; - payload[4U] = (m_dstId >> 0) & 0xFFU; - - payload[5U] = (m_srcId >> 16) & 0xFFU; - payload[6U] = (m_srcId >> 8) & 0xFFU; - payload[7U] = (m_srcId >> 0) & 0xFFU; - - payload[8U] |= m_GI ? 0x80U : 0x00U; - payload[8U] |= m_A ? 0x40U : 0x00U; - payload[8U] |= m_F ? 0x20U : 0x00U; - payload[8U] |= m_S ? 0x08U : 0x00U; - payload[8U] |= m_Ns & 0x07U; - - unsigned char parity[4U]; - CRS129::encode(payload, 9U, parity); - - payload[9U] = parity[2U] ^ TERMINATOR_WITH_LC_CRC_MASK[0U]; - payload[10U] = parity[1U] ^ TERMINATOR_WITH_LC_CRC_MASK[1U]; - payload[11U] = parity[0U] ^ TERMINATOR_WITH_LC_CRC_MASK[2U]; - - CUtils::dump(1U, "Data Terminator payload", payload, 12U); - - CBPTC19696 bptc; - bptc.encode(payload, bytes); - - CUtils::dump(1U, "Data Terminator bytes", bytes, DMR_FRAME_LENGTH_BYTES); -} - CDMRDataHeader& CDMRDataHeader::operator=(const CDMRDataHeader& header) { if (&header != this) { diff --git a/DMRDataHeader.h b/DMRDataHeader.h index e381e19..97c6036 100644 --- a/DMRDataHeader.h +++ b/DMRDataHeader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,8 +29,6 @@ public: void get(unsigned char* bytes) const; - void getTerminator(unsigned char* bytes) const; - bool getGI() const; unsigned int getSrcId() const;