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

implement appropriate RS encoding of LDU1 DFSI parameters;

Browse Source
pull/32/head
Bryan Biedenkapp 3 years ago
parent 0374ed2f54
commit 6a127f7e57
2 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File

64
src/p25/dfsi/LC.cpp
Unescape View File

@ -56,6 +56,7 @@ LC::LC() :
m_control(nullptr), m_control(nullptr),
m_lsd(nullptr), m_lsd(nullptr),
m_tsbk(nullptr), m_tsbk(nullptr),
m_rs(),
m_mi(nullptr) m_mi(nullptr)
{ {
m_mi = new uint8_t[P25_MI_LENGTH_BYTES]; m_mi = new uint8_t[P25_MI_LENGTH_BYTES];
@ -370,6 +371,7 @@ void LC::encodeLDU1(uint8_t* data, const uint8_t* imbe)
{ {
assert(data != nullptr); assert(data != nullptr);
assert(imbe != nullptr); assert(imbe != nullptr);
assert(m_control != nullptr);
uint8_t serviceOptions = uint8_t serviceOptions =
(m_control->getEmergency() ? 0x80U : 0x00U) + (m_control->getEmergency() ? 0x80U : 0x00U) +
@ -415,6 +417,24 @@ void LC::encodeLDU1(uint8_t* data, const uint8_t* imbe)
break; break;
} }
uint8_t rs[P25_LDU_LC_LENGTH_BYTES];
::memset(rs, 0x00U, P25_LDU_LC_LENGTH_BYTES);
rs[0U] = m_control->getLCO(); // LCO
rs[1U] = m_control->getMFId(); // MFId
rs[2U] = serviceOptions; // Service Options
uint32_t dstId = m_control->getDstId();
rs[3U] = (dstId >> 16) & 0xFFU; // Target Address
rs[4U] = (dstId >> 8) & 0xFFU;
rs[5U] = (dstId >> 0) & 0xFFU;
uint32_t srcId = m_control->getSrcId();
rs[6U] = (srcId >> 16) & 0xFFU; // Source Address
rs[7U] = (srcId >> 8) & 0xFFU;
rs[8U] = (srcId >> 0) & 0xFFU;
// encode RS (24,12,13) FEC
m_rs.encode241213(rs);
uint8_t dfsiFrame[frameLength]; uint8_t dfsiFrame[frameLength];
dfsiFrame[0U] = m_frameType; // Frame Type dfsiFrame[0U] = m_frameType; // Frame Type
@ -430,56 +450,54 @@ void LC::encodeLDU1(uint8_t* data, const uint8_t* imbe)
break; break;
case P25_DFSI_LDU1_VOICE3: case P25_DFSI_LDU1_VOICE3:
{ {
dfsiFrame[1U] = m_control->getLCO(); // LCO dfsiFrame[1U] = rs[0U]; // LCO
dfsiFrame[2U] = m_control->getMFId(); // MFId dfsiFrame[2U] = rs[1U]; // MFId
dfsiFrame[3U] = serviceOptions; // Service Options dfsiFrame[3U] = rs[2U]; // Service Options
::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE ::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE
dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status
} }
break; break;
case P25_DFSI_LDU1_VOICE4: case P25_DFSI_LDU1_VOICE4:
{ {
uint32_t dstId = m_control->getDstId(); dfsiFrame[1U] = rs[3U]; // Target Address
dfsiFrame[1U] = (dstId >> 16) & 0xFFU; // Target Address dfsiFrame[2U] = rs[4U];
dfsiFrame[2U] = (dstId >> 8) & 0xFFU; dfsiFrame[3U] = rs[5U];
dfsiFrame[3U] = (dstId >> 0) & 0xFFU;
::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE ::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE
dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status
} }
break; break;
case P25_DFSI_LDU1_VOICE5: case P25_DFSI_LDU1_VOICE5:
{ {
uint32_t srcId = m_control->getSrcId(); dfsiFrame[1U] = rs[6U]; // Source Address
dfsiFrame[1U] = (srcId >> 16) & 0xFFU; // Source Address dfsiFrame[2U] = rs[7U];
dfsiFrame[2U] = (srcId >> 8) & 0xFFU; dfsiFrame[3U] = rs[8U];
dfsiFrame[3U] = (srcId >> 0) & 0xFFU;
::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE ::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE
dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status
} }
break; break;
case P25_DFSI_LDU1_VOICE6: case P25_DFSI_LDU1_VOICE6:
{ {
// first 3 bytes of frame are supposed to be dfsiFrame[1U] = rs[9U]; // RS (24,12,13)
// part of the RS(24, 12, 13) of the VOICE3, 4, and 5 control dfsiFrame[2U] = rs[10U]; // RS (24,12,13)
// bytes dfsiFrame[3U] = rs[11U]; // RS (24,12,13)
::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE ::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE
dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status
} }
break; break;
case P25_DFSI_LDU1_VOICE7: case P25_DFSI_LDU1_VOICE7:
{ {
// first 3 bytes of frame are supposed to be dfsiFrame[1U] = rs[12U]; // RS (24,12,13)
// part of the RS(24, 12, 13) of the VOICE3, 4, and 5 control dfsiFrame[2U] = rs[13U]; // RS (24,12,13)
// bytes dfsiFrame[3U] = rs[14U]; // RS (24,12,13)
::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE ::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE
dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status
} }
break; break;
case P25_DFSI_LDU1_VOICE8: case P25_DFSI_LDU1_VOICE8:
{ {
// first 3 bytes of frame are supposed to be dfsiFrame[1U] = rs[15U]; // RS (24,12,13)
// part of the RS(24, 12, 13) of the VOICE3, 4, and 5 control dfsiFrame[2U] = rs[16U]; // RS (24,12,13)
// bytes dfsiFrame[3U] = rs[17U]; // RS (24,12,13)
::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE ::memcpy(dfsiFrame + 5U, imbe, P25_RAW_IMBE_LENGTH_BYTES); // IMBE
dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status dfsiFrame[16U] = P25_DFSI_STATUS_ERASE; // Status
} }
@ -522,6 +540,7 @@ bool LC::decodeLDU2(const uint8_t* data, uint8_t* imbe)
{ {
assert(data != nullptr); assert(data != nullptr);
assert(imbe != nullptr); assert(imbe != nullptr);
assert(m_control != nullptr);
m_frameType = data[0U]; // Frame Type m_frameType = data[0U]; // Frame Type
@ -575,7 +594,7 @@ bool LC::decodeLDU2(const uint8_t* data, uint8_t* imbe)
break; break;
case P25_DFSI_LDU2_VOICE15: case P25_DFSI_LDU2_VOICE15:
{ {
m_control->setAlgId(data[1U]); // Algorithm ID m_control->setAlgId(data[1U]); // Algorithm ID
uint32_t kid = (data[2U] << 8) | (data[3U] << 0); // Key ID uint32_t kid = (data[2U] << 8) | (data[3U] << 0); // Key ID
m_control->setKId(kid); m_control->setKId(kid);
::memcpy(imbe, data + 5U, P25_RAW_IMBE_LENGTH_BYTES); // IMBE ::memcpy(imbe, data + 5U, P25_RAW_IMBE_LENGTH_BYTES); // IMBE
@ -618,6 +637,7 @@ void LC::encodeLDU2(uint8_t* data, const uint8_t* imbe)
{ {
assert(data != nullptr); assert(data != nullptr);
assert(imbe != nullptr); assert(imbe != nullptr);
assert(m_control != nullptr);
// generate MI data // generate MI data
uint8_t mi[P25_MI_LENGTH_BYTES]; uint8_t mi[P25_MI_LENGTH_BYTES];
@ -798,8 +818,8 @@ bool LC::decodeTSBK(const uint8_t* data)
/// <param name="data"></param> /// <param name="data"></param>
void LC::encodeTSBK(uint8_t* data) void LC::encodeTSBK(uint8_t* data)
{ {
assert(m_tsbk != nullptr);
assert(data != nullptr); assert(data != nullptr);
assert(m_tsbk != nullptr);
uint8_t tsbk[P25_TSBK_LENGTH_BYTES]; uint8_t tsbk[P25_TSBK_LENGTH_BYTES];
m_tsbk->encode(tsbk, true, true); m_tsbk->encode(tsbk, true, true);

3
src/p25/dfsi/LC.h
Unescape View File

@ -30,6 +30,7 @@
#include "p25/data/LowSpeedData.h" #include "p25/data/LowSpeedData.h"
#include "p25/lc/LC.h" #include "p25/lc/LC.h"
#include "p25/lc/TSBK.h" #include "p25/lc/TSBK.h"
#include "edac/RS634717.h"
#include <string> #include <string>
@ -116,6 +117,8 @@ namespace p25
__PROPERTY_PLAIN(p25::lc::TSBK*, tsbk, tsbk); __PROPERTY_PLAIN(p25::lc::TSBK*, tsbk, tsbk);
private: private:
edac::RS634717 m_rs;
/** Encryption data */ /** Encryption data */
uint8_t* m_mi; uint8_t* m_mi;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.