Skip to content

Commit 3ab8bdf

Browse files
committed
Remove unneeded code.
1 parent 68b8ba0 commit 3ab8bdf

File tree

2 files changed

+1
-43
lines changed

2 files changed

+1
-43
lines changed

DMRDataHeader.cpp

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -166,46 +166,6 @@ unsigned int CDMRDataHeader::getBlocks() const
166166
return m_blocks;
167167
}
168168

169-
void CDMRDataHeader::getTerminator(unsigned char* bytes) const
170-
{
171-
assert(bytes != NULL);
172-
173-
unsigned char payload[12U];
174-
::memset(payload, 0x00U, 12U);
175-
176-
payload[0U] = m_GI ? FLCO_GROUP : FLCO_USER_USER;
177-
178-
payload[1U] = FID_ETSI;
179-
180-
payload[2U] = (m_dstId >> 16) & 0xFFU;
181-
payload[3U] = (m_dstId >> 8) & 0xFFU;
182-
payload[4U] = (m_dstId >> 0) & 0xFFU;
183-
184-
payload[5U] = (m_srcId >> 16) & 0xFFU;
185-
payload[6U] = (m_srcId >> 8) & 0xFFU;
186-
payload[7U] = (m_srcId >> 0) & 0xFFU;
187-
188-
payload[8U] |= m_GI ? 0x80U : 0x00U;
189-
payload[8U] |= m_A ? 0x40U : 0x00U;
190-
payload[8U] |= m_F ? 0x20U : 0x00U;
191-
payload[8U] |= m_S ? 0x08U : 0x00U;
192-
payload[8U] |= m_Ns & 0x07U;
193-
194-
unsigned char parity[4U];
195-
CRS129::encode(payload, 9U, parity);
196-
197-
payload[9U] = parity[2U] ^ TERMINATOR_WITH_LC_CRC_MASK[0U];
198-
payload[10U] = parity[1U] ^ TERMINATOR_WITH_LC_CRC_MASK[1U];
199-
payload[11U] = parity[0U] ^ TERMINATOR_WITH_LC_CRC_MASK[2U];
200-
201-
CUtils::dump(1U, "Data Terminator payload", payload, 12U);
202-
203-
CBPTC19696 bptc;
204-
bptc.encode(payload, bytes);
205-
206-
CUtils::dump(1U, "Data Terminator bytes", bytes, DMR_FRAME_LENGTH_BYTES);
207-
}
208-
209169
CDMRDataHeader& CDMRDataHeader::operator=(const CDMRDataHeader& header)
210170
{
211171
if (&header != this) {

DMRDataHeader.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
2+
* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
@@ -29,8 +29,6 @@ class CDMRDataHeader
2929

3030
void get(unsigned char* bytes) const;
3131

32-
void getTerminator(unsigned char* bytes) const;
33-
3432
bool getGI() const;
3533

3634
unsigned int getSrcId() const;

0 commit comments

Comments
 (0)