Fix build
This commit is contained in:
parent
31cc01c811
commit
58f9b7388c
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"files.associations": {
|
||||
"fstream": "cpp"
|
||||
"fstream": "cpp",
|
||||
"cstring": "cpp"
|
||||
}
|
||||
}
|
2
Conf.cpp
2
Conf.cpp
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "DStarDefines.h"
|
||||
#include "DMRDefines.h"
|
||||
#include "Conf.h"
|
||||
#include "Log.h"
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
*/
|
||||
|
||||
#include "DMRDefines.h"
|
||||
#include "M17Defines.h"
|
||||
#include "Thread.h"
|
||||
#include "Modem.h"
|
||||
#include "Utils.h"
|
||||
|
|
54
Sync.cpp
54
Sync.cpp
|
@ -18,25 +18,13 @@
|
|||
|
||||
#include "Sync.h"
|
||||
|
||||
#include "DStarDefines.h"
|
||||
#include "DMRDefines.h"
|
||||
#include "YSFDefines.h"
|
||||
#include "P25Defines.h"
|
||||
#include "NXDNDefines.h"
|
||||
#include "M17Defines.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, bool duplex)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
@ -63,46 +51,4 @@ void CSync::addDMRAudioSync(unsigned char* data, bool duplex)
|
|||
}
|
||||
}
|
||||
|
||||
void CSync::addYSFSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
::memcpy(data, YSF_SYNC_BYTES, YSF_SYNC_LENGTH_BYTES);
|
||||
}
|
||||
|
||||
void CSync::addP25Sync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
::memcpy(data, P25_SYNC_BYTES, P25_SYNC_LENGTH_BYTES);
|
||||
}
|
||||
|
||||
void CSync::addNXDNSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
for (unsigned int i = 0U; i < NXDN_FSW_BYTES_LENGTH; i++)
|
||||
data[i] = (data[i] & ~NXDN_FSW_BYTES_MASK[i]) | NXDN_FSW_BYTES[i];
|
||||
}
|
||||
|
||||
void CSync::addM17LinkSetupSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
::memcpy(data, M17_LINK_SETUP_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
|
||||
}
|
||||
|
||||
void CSync::addM17StreamSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
::memcpy(data, M17_STREAM_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
|
||||
}
|
||||
|
||||
void CSync::addM17EOTSync(unsigned char* data)
|
||||
{
|
||||
assert(data != NULL);
|
||||
|
||||
::memcpy(data, M17_EOT_SYNC_BYTES, M17_SYNC_LENGTH_BYTES);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue