Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'pocsag' into pocsag_test

Browse source
This commit is contained in:
Jonathan Naylor 2018-07-04 21:51:55 +01:00
parent a04d3a9825 5d9c7a39bd
commit 3cccc40d3f
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
P25NID.cpp
View file

@ -34,8 +34,8 @@ m_ldu1(NULL),
m_ldu2(NULL),
m_termlc(NULL),
m_term(NULL),
m_pdu(NULL),
m_tsdu(NULL)
m_tsdu(NULL),
m_pdu(NULL)
{
CBCH bch;
@ -96,6 +96,7 @@ CP25NID::~CP25NID()
delete[] m_ldu2;
delete[] m_termlc;
delete[] m_term;
delete[] m_tsdu;
delete[] m_pdu;
delete[] m_tsdu;
}

4
StopWatch.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
* Copyright (C) 2015,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
@ -74,7 +74,9 @@ unsigned int CStopWatch::elapsed()
{
struct timespec now;
::clock_gettime(CLOCK_MONOTONIC, &now);
int offset = ((now.tv_sec - m_start.tv_sec) * 1000000000UL + now.tv_nsec - m_start.tv_nsec ) / 1000000UL;
return (unsigned int)offset;
}

2
StopWatch.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
* Copyright (C) 2015,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