Centralise the Sync addition methods.
This commit is contained in:
parent
8e2e38e88c
commit
4e5bea9111
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include "DStarControl.h"
|
||||
#include "Utils.h"
|
||||
#include "Sync.h"
|
||||
#include "Log.h"
|
||||
|
||||
#include <cassert>
|
||||
|
@ -231,7 +232,7 @@ bool CDStarControl::writeModem(unsigned char *data)
|
|||
|
||||
// Regenerate the sync
|
||||
if (m_n == 0U)
|
||||
::memcpy(data + DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES);
|
||||
CSync::addDStarSync(data + 1U);
|
||||
|
||||
m_n = (m_n + 1U) % 21U;
|
||||
|
||||
|
@ -486,7 +487,7 @@ void CDStarControl::writeNetwork()
|
|||
|
||||
// Regenerate the sync
|
||||
if (n == 0U)
|
||||
::memcpy(data + DSTAR_VOICE_FRAME_LENGTH_BYTES + 2U, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES);
|
||||
CSync::addDStarSync(data + 2U);
|
||||
|
||||
m_n = n;
|
||||
|
||||
|
|
18
Sync.cpp
18
Sync.cpp
|
@ -17,12 +17,23 @@
|
|||
*/
|
||||
|
||||
#include "Sync.h"
|
||||
|
||||
#include "DStarDefines.h"
|
||||
#include "DMRDefines.h"
|
||||
#include "YSFDefines.h"
|
||||
|
||||
#include <cstdio>
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
|
||||
void CSync::addDStarSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
::memcpy(data + DSTAR_VOICE_FRAME_LENGTH_BYTES, DSTAR_SYNC_BYTES, DSTAR_DATA_FRAME_LENGTH_BYTES);
|
||||
}
|
||||
|
||||
void CSync::addDMRDataSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
@ -38,3 +49,10 @@ void CSync::addDMRAudioSync(unsigned char* data)
|
|||
for (unsigned int i = 0U; i < 7U; i++)
|
||||
data[i + 13U] = (data[i + 13U] & ~SYNC_MASK[i]) | BS_SOURCED_AUDIO_SYNC[i];
|
||||
}
|
||||
|
||||
void CSync::addYSFSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
::memcpy(data, YSF_SYNC_BYTES, YSF_SYNC_LENGTH_BYTES);
|
||||
}
|
||||
|
|
4
Sync.h
4
Sync.h
|
@ -22,9 +22,13 @@
|
|||
class CSync
|
||||
{
|
||||
public:
|
||||
static void addDStarSync(unsigned char* data);
|
||||
|
||||
static void addDMRDataSync(unsigned char* data);
|
||||
static void addDMRAudioSync(unsigned char* data);
|
||||
|
||||
static void addYSFSync(unsigned char* data);
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
const unsigned int YSF_FRAME_LENGTH_BYTES = 120U;
|
||||
|
||||
const unsigned char YSF_SYNC_BYTES[] = {0xD4U, 0x71U, 0xC9U, 0x63U, 0x4DU};
|
||||
const unsigned int YSF_SYNC_LENGTH_BYTES = 5U;
|
||||
|
||||
const unsigned char YSF_FI_MASK = 0xC0U;
|
||||
const unsigned char YSF_DT_MASK = 0x30U;
|
||||
|
|
Loading…
Reference in a new issue