Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

combine DMR and P25 Trellis implementations into a single EDAC implementation for conciseness;

Browse Source
pull/41/head
Bryan Biedenkapp 2 years ago
parent 015b9e2f0a
commit 06f25ca7de
14 changed files with 96 additions and 661 deletions
Show Stats Download Patch File Download Diff File

13
src/dmr/DMRDefines.h
Unescape View File

@ -325,17 +325,4 @@ namespace dmr
const uint32_t NO_PREAMBLE_CSBK = 15U; const uint32_t NO_PREAMBLE_CSBK = 15U;
} // namespace dmr } // namespace dmr
// ---------------------------------------------------------------------------
// Namespace Prototypes
// ---------------------------------------------------------------------------
namespace edac { }
namespace dmr
{
namespace edac
{
using namespace ::edac;
} // namespace edac
} // namespace dmr
#endif // __DMR_DEFINES_H__ #endif // __DMR_DEFINES_H__

463
src/dmr/edac/Trellis.cpp
Unescape View File

@ -1,463 +0,0 @@
/**
* Digital Voice Modem - Host Software
* GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2016 by Jonathan Naylor, G4KLX
* Copyright (C) 2023 by Bryan Biedenkapp N2PLL
*
* 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
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "Defines.h"
#include "dmr/edac/Trellis.h"
#include "Log.h"
using namespace dmr::edac;
#include <cstdio>
#include <cassert>
// ---------------------------------------------------------------------------
// Constants
// ---------------------------------------------------------------------------
const uint32_t INTERLEAVE_TABLE[] = {
0U, 1U, 8U, 9U, 16U, 17U, 24U, 25U, 32U, 33U, 40U, 41U, 48U, 49U, 56U, 57U, 64U, 65U, 72U, 73U, 80U, 81U, 88U, 89U, 96U, 97U,
2U, 3U, 10U, 11U, 18U, 19U, 26U, 27U, 34U, 35U, 42U, 43U, 50U, 51U, 58U, 59U, 66U, 67U, 74U, 75U, 82U, 83U, 90U, 91U,
4U, 5U, 12U, 13U, 20U, 21U, 28U, 29U, 36U, 37U, 44U, 45U, 52U, 53U, 60U, 61U, 68U, 69U, 76U, 77U, 84U, 85U, 92U, 93U,
6U, 7U, 14U, 15U, 22U, 23U, 30U, 31U, 38U, 39U, 46U, 47U, 54U, 55U, 62U, 63U, 70U, 71U, 78U, 79U, 86U, 87U, 94U, 95U };
const uint8_t ENCODE_TABLE[] = {
0U, 8U, 4U, 12U, 2U, 10U, 6U, 14U,
4U, 12U, 2U, 10U, 6U, 14U, 0U, 8U,
1U, 9U, 5U, 13U, 3U, 11U, 7U, 15U,
5U, 13U, 3U, 11U, 7U, 15U, 1U, 9U,
3U, 11U, 7U, 15U, 1U, 9U, 5U, 13U,
7U, 15U, 1U, 9U, 5U, 13U, 3U, 11U,
2U, 10U, 6U, 14U, 0U, 8U, 4U, 12U,
6U, 14U, 0U, 8U, 4U, 12U, 2U, 10U };
// ---------------------------------------------------------------------------
// Public Class Members
// ---------------------------------------------------------------------------
/// <summary>
/// Initializes a new instance of the Trellis class.
/// </summary>
Trellis::Trellis()
{
/* stub */
}
/// <summary>
/// Finalizes a instance of the Trellis class.
/// </summary>
Trellis::~Trellis()
{
/* stub */
}
/// <summary>
/// Decodes 3/4 rate Trellis.
/// </summary>
/// <param name="data">Trellis symbol bytes.</param>
/// <param name="payload">Output bytes.</param>
/// <returns>True, if decoded, otherwise false.</returns>
bool Trellis::decode(const uint8_t* data, uint8_t* payload)
{
assert(data != nullptr);
assert(payload != nullptr);
int8_t dibits[98U];
deinterleave(data, dibits);
uint8_t points[49U];
dibitsToPoints(dibits, points);
// Check the original code
uint8_t tribits[49U];
uint32_t failPos = checkCode(points, tribits);
if (failPos == 999U) {
tribitsToBits(tribits, payload);
return true;
}
uint8_t savePoints[49U];
for (uint32_t i = 0U; i < 49U; i++)
savePoints[i] = points[i];
bool ret = fixCode(points, failPos, payload);
if (ret)
return true;
if (failPos == 0U)
return false;
// Backtrack one place for a last go
return fixCode(savePoints, failPos - 1U, payload);
}
/// <summary>
/// Encodes 3/4 rate Trellis.
/// </summary>
/// <param name="payload">Input bytes.</param>
/// <param name="data">Trellis symbol bytes.</param>
void Trellis::encode(const uint8_t* payload, uint8_t* data)
{
assert(payload != nullptr);
assert(data != nullptr);
uint8_t tribits[49U];
bitsToTribits(payload, tribits);
uint8_t points[49U];
uint8_t state = 0U;
for (uint32_t i = 0U; i < 49U; i++) {
uint8_t tribit = tribits[i];
points[i] = ENCODE_TABLE[state * 8U + tribit];
state = tribit;
}
int8_t dibits[98U];
pointsToDibits(points, dibits);
interleave(dibits, data);
}
// ---------------------------------------------------------------------------
// Private Class Members
// ---------------------------------------------------------------------------
/// <summary>
/// Helper to deinterleave the input symbols into dibits.
/// </summary>
/// <param name="data">Trellis symbol bytes.</param>
/// <param name="dibits">Dibits.</param>
void Trellis::deinterleave(const uint8_t* data, int8_t* dibits) const
{
for (uint32_t i = 0U; i < 98U; i++) {
uint32_t n = i * 2U + 0U;
if (n >= 98U) n += 68U;
bool b1 = READ_BIT(data, n) != 0x00U;
n = i * 2U + 1U;
if (n >= 98U) n += 68U;
bool b2 = READ_BIT(data, n) != 0x00U;
int8_t dibit;
if (!b1 && b2)
dibit = +3;
else if (!b1 && !b2)
dibit = +1;
else if (b1 && !b2)
dibit = -1;
else
dibit = -3;
n = INTERLEAVE_TABLE[i];
dibits[n] = dibit;
}
}
/// <summary>
/// Helper to interleave the input dibits into symbols.
/// </summary>
/// <param name="dibits">Dibits.</param>
/// <param name="data">Trellis symbol bytes.</param>
void Trellis::interleave(const int8_t* dibits, uint8_t* data) const
{
for (uint32_t i = 0U; i < 98U; i++) {
uint32_t n = INTERLEAVE_TABLE[i];
bool b1, b2;
switch (dibits[n]) {
case +3:
b1 = false;
b2 = true;
break;
case +1:
b1 = false;
b2 = false;
break;
case -1:
b1 = true;
b2 = false;
break;
default:
b1 = true;
b2 = true;
break;
}
n = i * 2U + 0U;
if (n >= 98U) n += 68U;
WRITE_BIT(data, n, b1);
n = i * 2U + 1U;
if (n >= 98U) n += 68U;
WRITE_BIT(data, n, b2);
}
}
/// <summary>
/// Helper to map dibits to 4FSK constellation points.
/// </summary>
/// <param name="dibits">Dibits.</param>
/// <param name="points">4FSK constellation points.</param>
void Trellis::dibitsToPoints(const int8_t* dibits, uint8_t* points) const
{
for (uint32_t i = 0U; i < 49U; i++) {
if (dibits[i * 2U + 0U] == +1 && dibits[i * 2U + 1U] == -1)
points[i] = 0U;
else if (dibits[i * 2U + 0U] == -1 && dibits[i * 2U + 1U] == -1)
points[i] = 1U;
else if (dibits[i * 2U + 0U] == +3 && dibits[i * 2U + 1U] == -3)
points[i] = 2U;
else if (dibits[i * 2U + 0U] == -3 && dibits[i * 2U + 1U] == -3)
points[i] = 3U;
else if (dibits[i * 2U + 0U] == -3 && dibits[i * 2U + 1U] == -1)
points[i] = 4U;
else if (dibits[i * 2U + 0U] == +3 && dibits[i * 2U + 1U] == -1)
points[i] = 5U;
else if (dibits[i * 2U + 0U] == -1 && dibits[i * 2U + 1U] == -3)
points[i] = 6U;
else if (dibits[i * 2U + 0U] == +1 && dibits[i * 2U + 1U] == -3)
points[i] = 7U;
else if (dibits[i * 2U + 0U] == -3 && dibits[i * 2U + 1U] == +3)
points[i] = 8U;
else if (dibits[i * 2U + 0U] == +3 && dibits[i * 2U + 1U] == +3)
points[i] = 9U;
else if (dibits[i * 2U + 0U] == -1 && dibits[i * 2U + 1U] == +1)
points[i] = 10U;
else if (dibits[i * 2U + 0U] == +1 && dibits[i * 2U + 1U] == +1)
points[i] = 11U;
else if (dibits[i * 2U + 0U] == +1 && dibits[i * 2U + 1U] == +3)
points[i] = 12U;
else if (dibits[i * 2U + 0U] == -1 && dibits[i * 2U + 1U] == +3)
points[i] = 13U;
else if (dibits[i * 2U + 0U] == +3 && dibits[i * 2U + 1U] == +1)
points[i] = 14U;
else if (dibits[i * 2U + 0U] == -3 && dibits[i * 2U + 1U] == +1)
points[i] = 15U;
}
}
/// <summary>
/// Helper to map 4FSK constellation points to dibits.
/// </summary>
/// <param name="points">4FSK Constellation points.</param>
/// <param name="dibits">Dibits.</param>
void Trellis::pointsToDibits(const uint8_t* points, int8_t* dibits) const
{
for (uint32_t i = 0U; i < 49U; i++) {
switch (points[i]) {
case 0U:
dibits[i * 2U + 0U] = +1;
dibits[i * 2U + 1U] = -1;
break;
case 1U:
dibits[i * 2U + 0U] = -1;
dibits[i * 2U + 1U] = -1;
break;
case 2U:
dibits[i * 2U + 0U] = +3;
dibits[i * 2U + 1U] = -3;
break;
case 3U:
dibits[i * 2U + 0U] = -3;
dibits[i * 2U + 1U] = -3;
break;
case 4U:
dibits[i * 2U + 0U] = -3;
dibits[i * 2U + 1U] = -1;
break;
case 5U:
dibits[i * 2U + 0U] = +3;
dibits[i * 2U + 1U] = -1;
break;
case 6U:
dibits[i * 2U + 0U] = -1;
dibits[i * 2U + 1U] = -3;
break;
case 7U:
dibits[i * 2U + 0U] = +1;
dibits[i * 2U + 1U] = -3;
break;
case 8U:
dibits[i * 2U + 0U] = -3;
dibits[i * 2U + 1U] = +3;
break;
case 9U:
dibits[i * 2U + 0U] = +3;
dibits[i * 2U + 1U] = +3;
break;
case 10U:
dibits[i * 2U + 0U] = -1;
dibits[i * 2U + 1U] = +1;
break;
case 11U:
dibits[i * 2U + 0U] = +1;
dibits[i * 2U + 1U] = +1;
break;
case 12U:
dibits[i * 2U + 0U] = +1;
dibits[i * 2U + 1U] = +3;
break;
case 13U:
dibits[i * 2U + 0U] = -1;
dibits[i * 2U + 1U] = +3;
break;
case 14U:
dibits[i * 2U + 0U] = +3;
dibits[i * 2U + 1U] = +1;
break;
default:
dibits[i * 2U + 0U] = -3;
dibits[i * 2U + 1U] = +1;
break;
}
}
}
/// <summary>
/// Helper to convert a byte payload into tribits.
/// </summary>
/// <param name="payload">Byte payload.</param>
/// <param name="tribits">Tribits.</param>
void Trellis::bitsToTribits(const uint8_t* payload, uint8_t* tribits) const
{
for (uint32_t i = 0U; i < 48U; i++) {
uint32_t n = i * 3U;
bool b1 = READ_BIT(payload, n) != 0x00U;
n++;
bool b2 = READ_BIT(payload, n) != 0x00U;
n++;
bool b3 = READ_BIT(payload, n) != 0x00U;
uint8_t tribit = 0U;
tribit |= b1 ? 4U : 0U;
tribit |= b2 ? 2U : 0U;
tribit |= b3 ? 1U : 0U;
tribits[i] = tribit;
}
tribits[48U] = 0U;
}
/// <summary>
/// Helper to convert tribits into a byte payload.
/// </summary>
/// <param name="tribits">Tribits.</param>
/// <param name="payload">Byte payload.</param>
void Trellis::tribitsToBits(const uint8_t* tribits, uint8_t* payload) const
{
for (uint32_t i = 0U; i < 48U; i++) {
uint8_t tribit = tribits[i];
bool b1 = (tribit & 0x04U) == 0x04U;
bool b2 = (tribit & 0x02U) == 0x02U;
bool b3 = (tribit & 0x01U) == 0x01U;
uint32_t n = i * 3U;
WRITE_BIT(payload, n, b1);
n++;
WRITE_BIT(payload, n, b2);
n++;
WRITE_BIT(payload, n, b3);
}
}
/// <summary>
/// Helper to fix errors in Trellis coding.
/// </summary>
/// <param name="points">4FSK constellation points.</param>
/// <param name="failPos"></param>
/// <param name="payload">Byte payload.</param>
/// <returns>True, if error corrected, otherwise false.</returns>
bool Trellis::fixCode(uint8_t* points, uint32_t failPos, uint8_t* payload) const
{
#if DEBUG_TRELLIS
::LogDebug(LOG_HOST, "Trellis::fixCode() failPos = %u, val = %01X", failPos, points[failPos]);
#endif
for (unsigned j = 0U; j < 20U; j++) {
uint32_t bestPos = 0U;
uint32_t bestVal = 0U;
for (uint32_t i = 0U; i < 16U; i++) {
points[failPos] = i;
uint8_t tribits[49U];
uint32_t pos = checkCode(points, tribits);
if (pos == 999U) {
#if DEBUG_TRELLIS
::LogDebug(LOG_HOST, "Trellis::fixCode() fixed, failPos = %u, pos = %u, val = %01X", failPos, bestPos, bestVal);
#endif
tribitsToBits(tribits, payload);
return true;
}
if (pos > bestPos) {
bestPos = pos;
bestVal = i;
}
}
points[failPos] = bestVal;
failPos = bestPos;
}
return false;
}
/// <summary>
/// Helper to detect errors in Trellis coding.
/// </summary>
/// <param name="points">4FSK constellation points.</param>
/// <param name="tribits">Tribits.</param>
/// <returns></returns>
uint32_t Trellis::checkCode(const uint8_t* points, uint8_t* tribits) const
{
uint8_t state = 0U;
for (uint32_t i = 0U; i < 49U; i++) {
tribits[i] = 9U;
for (uint32_t j = 0U; j < 8U; j++) {
if (points[i] == ENCODE_TABLE[state * 8U + j]) {
tribits[i] = j;
break;
}
}
if (tribits[i] == 9U)
return i;
state = tribits[i];
}
if (tribits[48U] != 0U)
return 48U;
return 999U;
}

73
src/dmr/edac/Trellis.h
Unescape View File

@ -1,73 +0,0 @@
/**
* Digital Voice Modem - Host Software
* GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2016 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
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#if !defined(__DMR_EDAC__TRELLIS_H__)
#define __DMR_EDAC__TRELLIS_H__
#include "Defines.h"
namespace dmr
{
namespace edac
{
// ---------------------------------------------------------------------------
// Class Declaration
// Implements 3/4 rate Trellis for DMR.
// ---------------------------------------------------------------------------
class HOST_SW_API Trellis {
public:
/// <summary>Initializes a new instance of the Trellis class.</summary>
Trellis();
/// <summary>Finalizes a instance of the Trellis class.</summary>
~Trellis();
/// <summary>Decodes 3/4 rate Trellis.</summary>
bool decode(const uint8_t* data, uint8_t* payload);
/// <summary>Encodes 3/4 rate Trellis.</summary>
void encode(const uint8_t* payload, uint8_t* data);
private:
/// <summary>Helper to deinterleave the input symbols into dibits.</summary>
void deinterleave(const uint8_t* in, int8_t* dibits) const;
/// <summary>Helper to interleave the input dibits into symbols.</summary>
void interleave(const int8_t* dibits, uint8_t* out) const;
/// <summary>Helper to map dibits to C4FM constellation points.</summary>
void dibitsToPoints(const int8_t* dibits, uint8_t* points) const;
/// <summary>Helper to map C4FM constellation points to dibits.</summary>
void pointsToDibits(const uint8_t* points, int8_t* dibits) const;
/// <summary>Helper to convert a byte payload into tribits.</summary>
void bitsToTribits(const uint8_t* payload, uint8_t* tribits) const;
/// <summary>Helper to convert tribits into a byte payload.</summary>
void tribitsToBits(const uint8_t* tribits, uint8_t* payload) const;
/// <summary>Helper to fix errors in Trellis coding.</summary>
bool fixCode(uint8_t* points, uint32_t failPos, uint8_t* payload) const;
/// <summary>Helper to detect errors in Trellis coding.</summary>
uint32_t checkCode(const uint8_t* points, uint8_t* tribits) const;
};
} // namespace edac
} // namespace dmr
#endif // __DMR_EDAC__TRELLIS_H__

1
src/dmr/packet/ControlSignaling.cpp
Unescape View File

@ -28,7 +28,6 @@
#include "dmr/acl/AccessControl.h" #include "dmr/acl/AccessControl.h"
#include "dmr/data/DataHeader.h" #include "dmr/data/DataHeader.h"
#include "dmr/data/EMB.h" #include "dmr/data/EMB.h"
#include "dmr/edac/Trellis.h"
#include "dmr/lc/ShortLC.h" #include "dmr/lc/ShortLC.h"
#include "dmr/lc/FullLC.h" #include "dmr/lc/FullLC.h"
#include "dmr/lc/CSBK.h" #include "dmr/lc/CSBK.h"

10
src/dmr/packet/Data.cpp
Unescape View File

@ -27,7 +27,6 @@
#include "dmr/packet/Data.h" #include "dmr/packet/Data.h"
#include "dmr/acl/AccessControl.h" #include "dmr/acl/AccessControl.h"
#include "dmr/data/EMB.h" #include "dmr/data/EMB.h"
#include "dmr/edac/Trellis.h"
#include "dmr/lc/ShortLC.h" #include "dmr/lc/ShortLC.h"
#include "dmr/lc/FullLC.h" #include "dmr/lc/FullLC.h"
#include "dmr/lc/CSBK.h" #include "dmr/lc/CSBK.h"
@ -36,6 +35,7 @@
#include "dmr/Sync.h" #include "dmr/Sync.h"
#include "edac/BPTC19696.h" #include "edac/BPTC19696.h"
#include "edac/CRC.h" #include "edac/CRC.h"
#include "edac/Trellis.h"
#include "Log.h" #include "Log.h"
#include "Utils.h" #include "Utils.h"
@ -272,13 +272,13 @@ bool Data::process(uint8_t* data, uint32_t len)
else if (dataType == DT_RATE_34_DATA) { else if (dataType == DT_RATE_34_DATA) {
// decode the Trellis 3/4 rate FEC // decode the Trellis 3/4 rate FEC
uint8_t payload[18U]; uint8_t payload[18U];
bool ret = trellis.decode(data + 2U, payload); bool ret = trellis.decode34(data + 2U, payload);
if (ret) { if (ret) {
// store payload // store payload
::memcpy(m_pduUserData, payload, 18U); ::memcpy(m_pduUserData, payload, 18U);
// encode the Trellis 3/4 rate FEC // encode the Trellis 3/4 rate FEC
trellis.encode(payload, data + 2U); trellis.encode34(payload, data + 2U);
} }
else { else {
LogWarning(LOG_RF, "DMR Slot %u, DT_RATE_34_DATA, unfixable RF rate 3/4 data", m_slot->m_slotNo); LogWarning(LOG_RF, "DMR Slot %u, DT_RATE_34_DATA, unfixable RF rate 3/4 data", m_slot->m_slotNo);
@ -478,13 +478,13 @@ void Data::processNetwork(const data::Data& dmrData)
// decode the Trellis 3/4 rate FEC // decode the Trellis 3/4 rate FEC
edac::Trellis trellis; edac::Trellis trellis;
uint8_t payload[18U]; uint8_t payload[18U];
bool ret = trellis.decode(data + 2U, payload); bool ret = trellis.decode34(data + 2U, payload);
if (ret) { if (ret) {
// store payload // store payload
::memcpy(m_pduUserData, payload, 18U); ::memcpy(m_pduUserData, payload, 18U);
// encode the Trellis 3/4 rate FEC // encode the Trellis 3/4 rate FEC
trellis.encode(payload, data + 2U); trellis.encode34(payload, data + 2U);
} }
else { else {
LogWarning(LOG_NET, "DMR Slot %u, DT_RATE_34_DATA, unfixable network rate 3/4 data", m_slot->m_slotNo); LogWarning(LOG_NET, "DMR Slot %u, DT_RATE_34_DATA, unfixable network rate 3/4 data", m_slot->m_slotNo);

1
src/dmr/packet/Voice.cpp
Unescape View File

@ -29,7 +29,6 @@
#include "dmr/acl/AccessControl.h" #include "dmr/acl/AccessControl.h"
#include "dmr/data/DataHeader.h" #include "dmr/data/DataHeader.h"
#include "dmr/data/EMB.h" #include "dmr/data/EMB.h"
#include "dmr/edac/Trellis.h"
#include "dmr/lc/CSBK.h" #include "dmr/lc/CSBK.h"
#include "dmr/lc/ShortLC.h" #include "dmr/lc/ShortLC.h"
#include "dmr/lc/FullLC.h" #include "dmr/lc/FullLC.h"

4
src/p25/edac/Trellis.cpp → src/edac/Trellis.cpp
Unescape View File

@ -24,10 +24,10 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include "Defines.h" #include "Defines.h"
#include "p25/edac/Trellis.h" #include "edac/Trellis.h"
#include "Log.h" #include "Log.h"
using namespace p25::edac; using namespace edac;
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>

84
src/edac/Trellis.h
Unescape View File

@ -0,0 +1,84 @@
/**
* Digital Voice Modem - Host Software
* GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2016,2018 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
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#if !defined(__EDAC__TRELLIS_H__)
#define __EDAC__TRELLIS_H__
#include "Defines.h"
namespace edac
{
// ---------------------------------------------------------------------------
// Class Declaration
// Implements 1/2 rate and 3/4 rate Trellis for P25.
// ---------------------------------------------------------------------------
class HOST_SW_API Trellis {
public:
/// <summary>Initializes a new instance of the Trellis class.</summary>
Trellis();
/// <summary>Finalizes a instance of the Trellis class.</summary>
~Trellis();
/// <summary>Decodes 3/4 rate Trellis.</summary>
bool decode34(const uint8_t* data, uint8_t* payload);
/// <summary>Encodes 3/4 rate Trellis.</summary>
void encode34(const uint8_t* payload, uint8_t* data);
/// <summary>Decodes 1/2 rate Trellis.</summary>
bool decode12(const uint8_t* data, uint8_t* payload);
/// <summary>Encodes 1/2 rate Trellis.</summary>
void encode12(const uint8_t* payload, uint8_t* data);
private:
/// <summary>Helper to deinterleave the input symbols into dibits.</summary>
void deinterleave(const uint8_t* in, int8_t* dibits) const;
/// <summary>Helper to interleave the input dibits into symbols.</summary>
void interleave(const int8_t* dibits, uint8_t* out) const;
/// <summary>Helper to map dibits to C4FM constellation points.</summary>
void dibitsToPoints(const int8_t* dibits, uint8_t* points) const;
/// <summary>Helper to map C4FM constellation points to dibits.</summary>
void pointsToDibits(const uint8_t* points, int8_t* dibits) const;
/// <summary>Helper to convert a byte payload into tribits.</summary>
void bitsToTribits(const uint8_t* payload, uint8_t* tribits) const;
/// <summary>Helper to convert a byte payload into dibits.</summary>
void bitsToDibits(const uint8_t* payload, uint8_t* dibits) const;
/// <summary>Helper to convert tribits into a byte payload.</summary>
void tribitsToBits(const uint8_t* tribits, uint8_t* payload) const;
/// <summary>Helper to convert dibits into a byte payload.</summary>
void dibitsToBits(const uint8_t* dibits, uint8_t* payload) const;
/// <summary>Helper to fix errors in Trellis coding.</summary>
bool fixCode34(uint8_t* points, uint32_t failPos, uint8_t* payload) const;
/// <summary>Helper to detect errors in Trellis coding.</summary>
uint32_t checkCode34(const uint8_t* points, uint8_t* tribits) const;
/// <summary>Helper to fix errors in Trellis coding.</summary>
bool fixCode12(uint8_t* points, uint32_t failPos, uint8_t* payload) const;
/// <summary>Helper to detect errors in Trellis coding.</summary>
uint32_t checkCode12(const uint8_t* points, uint8_t* dibits) const;
};
} // namespace edac
#endif // __EDAC__TRELLIS_H__

12
src/p25/P25Defines.h
Unescape View File

@ -373,16 +373,4 @@ namespace p25
#define P25_TDULC_STR "P25_DUID_TDULC (Terminator Data Unit with Link Control)" #define P25_TDULC_STR "P25_DUID_TDULC (Terminator Data Unit with Link Control)"
} // namespace p25 } // namespace p25
// ---------------------------------------------------------------------------
// Namespace Prototypes
// ---------------------------------------------------------------------------
namespace edac { }
namespace p25
{
namespace edac
{
using namespace ::edac;
} // namespace edac
} // namespace p25
#endif // __P25_DEFINES_H__ #endif // __P25_DEFINES_H__

2
src/p25/data/DataBlock.h
Unescape View File

@ -28,7 +28,7 @@
#include "Defines.h" #include "Defines.h"
#include "p25/data/DataHeader.h" #include "p25/data/DataHeader.h"
#include "p25/edac/Trellis.h" #include "edac/Trellis.h"
#include <string> #include <string>

2
src/p25/data/DataHeader.h
Unescape View File

@ -27,7 +27,7 @@
#define __P25_DATA__DATA_HEADER_H__ #define __P25_DATA__DATA_HEADER_H__
#include "Defines.h" #include "Defines.h"
#include "p25/edac/Trellis.h" #include "edac/Trellis.h"
#include <string> #include <string>

87
src/p25/edac/Trellis.h
Unescape View File

@ -1,87 +0,0 @@
/**
* Digital Voice Modem - Host Software
* GPLv2 Open Source. Use is subject to license terms.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* @package DVM / Host Software
*
*/
//
// Based on code from the MMDVMHost project. (https://github.com/g4klx/MMDVMHost)
// Licensed under the GPLv2 License (https://opensource.org/licenses/GPL-2.0)
//
/*
* Copyright (C) 2016,2018 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
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#if !defined(__P25_EDAC__TRELLIS_H__)
#define __P25_EDAC__TRELLIS_H__
#include "Defines.h"
namespace p25
{
namespace edac
{
// ---------------------------------------------------------------------------
// Class Declaration
// Implements 1/2 rate and 3/4 rate Trellis for P25.
// ---------------------------------------------------------------------------
class HOST_SW_API Trellis {
public:
/// <summary>Initializes a new instance of the Trellis class.</summary>
Trellis();
/// <summary>Finalizes a instance of the Trellis class.</summary>
~Trellis();
/// <summary>Decodes 3/4 rate Trellis.</summary>
bool decode34(const uint8_t* data, uint8_t* payload);
/// <summary>Encodes 3/4 rate Trellis.</summary>
void encode34(const uint8_t* payload, uint8_t* data);
/// <summary>Decodes 1/2 rate Trellis.</summary>
bool decode12(const uint8_t* data, uint8_t* payload);
/// <summary>Encodes 1/2 rate Trellis.</summary>
void encode12(const uint8_t* payload, uint8_t* data);
private:
/// <summary>Helper to deinterleave the input symbols into dibits.</summary>
void deinterleave(const uint8_t* in, int8_t* dibits) const;
/// <summary>Helper to interleave the input dibits into symbols.</summary>
void interleave(const int8_t* dibits, uint8_t* out) const;
/// <summary>Helper to map dibits to C4FM constellation points.</summary>
void dibitsToPoints(const int8_t* dibits, uint8_t* points) const;
/// <summary>Helper to map C4FM constellation points to dibits.</summary>
void pointsToDibits(const uint8_t* points, int8_t* dibits) const;
/// <summary>Helper to convert a byte payload into tribits.</summary>
void bitsToTribits(const uint8_t* payload, uint8_t* tribits) const;
/// <summary>Helper to convert a byte payload into dibits.</summary>
void bitsToDibits(const uint8_t* payload, uint8_t* dibits) const;
/// <summary>Helper to convert tribits into a byte payload.</summary>
void tribitsToBits(const uint8_t* tribits, uint8_t* payload) const;
/// <summary>Helper to convert dibits into a byte payload.</summary>
void dibitsToBits(const uint8_t* dibits, uint8_t* payload) const;
/// <summary>Helper to fix errors in Trellis coding.</summary>
bool fixCode34(uint8_t* points, uint32_t failPos, uint8_t* payload) const;
/// <summary>Helper to detect errors in Trellis coding.</summary>
uint32_t checkCode34(const uint8_t* points, uint8_t* tribits) const;
/// <summary>Helper to fix errors in Trellis coding.</summary>
bool fixCode12(uint8_t* points, uint32_t failPos, uint8_t* payload) const;
/// <summary>Helper to detect errors in Trellis coding.</summary>
uint32_t checkCode12(const uint8_t* points, uint8_t* dibits) const;
};
} // namespace edac
} // namespace p25
#endif // __P25_EDAC__TRELLIS_H__

2
src/p25/lc/TSBK.h
Unescape View File

@ -27,7 +27,7 @@
#define __P25_LC__TSBK_H__ #define __P25_LC__TSBK_H__
#include "Defines.h" #include "Defines.h"
#include "p25/edac/Trellis.h" #include "edac/Trellis.h"
#include "p25/lc/LC.h" #include "p25/lc/LC.h"
#include "p25/lc/TDULC.h" #include "p25/lc/TDULC.h"
#include "p25/SiteData.h" #include "p25/SiteData.h"

3
src/p25/lc/tsbk/TSBKFactory.h
Unescape View File

@ -28,7 +28,8 @@
#include "Defines.h" #include "Defines.h"
#include "p25/edac/Trellis.h" #include "edac/Trellis.h"
#include "p25/lc/TSBK.h" #include "p25/lc/TSBK.h"
#include "p25/lc/tsbk/IOSP_ACK_RSP.h" #include "p25/lc/tsbk/IOSP_ACK_RSP.h"
#include "p25/lc/tsbk/IOSP_CALL_ALRT.h" #include "p25/lc/tsbk/IOSP_CALL_ALRT.h"

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.