aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Chemeris <Alexander.Chemeris@gmail.com>2017-03-17 22:35:02 -0700
committerAlexander Chemeris <Alexander.Chemeris@gmail.com>2017-03-28 14:24:07 +0000
commit1470fcdb5a9abd9dd1e3b5ed401df88ef9e87cc3 (patch)
tree14eb2be372a7757a2bb2c4befa6e8c0c1aa6b255
parent6e1dffd486745105e4662d4f5009ed0c34c79b66 (diff)
sigProcLib: constify signalVector arguments for detectBurst() functions.
-rw-r--r--Transceiver52M/sigProcLib.cpp35
-rw-r--r--Transceiver52M/sigProcLib.h12
2 files changed, 24 insertions, 23 deletions
diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp
index 467a203..eaaae34 100644
--- a/Transceiver52M/sigProcLib.cpp
+++ b/Transceiver52M/sigProcLib.cpp
@@ -1707,7 +1707,7 @@ static float computePeakRatio(signalVector *corr,
return (amp.abs()) / rms;
}
-float energyDetect(signalVector &rxBurst, unsigned windowLength)
+float energyDetect(const signalVector &rxBurst, unsigned windowLength)
{
signalVector::const_iterator windowItr = rxBurst.begin(); //+rxBurst.size()/2 - 5*windowLength/2;
@@ -1729,12 +1729,13 @@ float energyDetect(signalVector &rxBurst, unsigned windowLength)
* For higher oversampling values, we assume the energy detector is in place
* and we run full interpolating peak detection.
*/
-static int detectBurst(signalVector &burst,
+static int detectBurst(const signalVector &burst,
signalVector &corr, CorrelationSequence *sync,
float thresh, int sps, complex *amp, float *toa,
int start, int len)
{
- signalVector *corr_in, *dec = NULL;
+ const signalVector *corr_in;
+ signalVector *dec = NULL;
if (sps == 4) {
dec = downsampleBurst(burst);
@@ -1782,7 +1783,7 @@ static int detectBurst(signalVector &burst,
return 1;
}
-static float maxAmplitude(signalVector &burst)
+static float maxAmplitude(const signalVector &burst)
{
float max = 0.0;
for (size_t i = 0; i < burst.size(); i++) {
@@ -1803,13 +1804,13 @@ static float maxAmplitude(signalVector &burst)
* head: Search symbols before target
* tail: Search symbols after target
*/
-int detectGeneralBurst(signalVector &rxBurst,
- float thresh,
- int sps,
- complex &amp,
- float &toa,
- int target, int head, int tail,
- CorrelationSequence *sync)
+static int detectGeneralBurst(const signalVector &rxBurst,
+ float thresh,
+ int sps,
+ complex &amp,
+ float &toa,
+ int target, int head, int tail,
+ CorrelationSequence *sync)
{
int rc, start, len;
bool clipping = false;
@@ -1858,7 +1859,7 @@ int detectGeneralBurst(signalVector &rxBurst,
* head: Search 8 symbols before target
* tail: Search 8 symbols + maximum expected delay
*/
-int detectRACHBurst(signalVector &burst,
+int detectRACHBurst(const signalVector &burst,
float threshold,
int sps,
complex &amplitude,
@@ -1887,7 +1888,7 @@ int detectRACHBurst(signalVector &burst,
* head: Search 6 symbols before target
* tail: Search 6 symbols + maximum expected delay
*/
-int analyzeTrafficBurst(signalVector &burst, unsigned tsc, float threshold,
+int analyzeTrafficBurst(const signalVector &burst, unsigned tsc, float threshold,
int sps, complex &amplitude, float &toa, unsigned max_toa)
{
int rc, target, head, tail;
@@ -1906,7 +1907,7 @@ int analyzeTrafficBurst(signalVector &burst, unsigned tsc, float threshold,
return rc;
}
-int detectEdgeBurst(signalVector &burst, unsigned tsc, float threshold,
+int detectEdgeBurst(const signalVector &burst, unsigned tsc, float threshold,
int sps, complex &amplitude, float &toa, unsigned max_toa)
{
int rc, target, head, tail;
@@ -1925,7 +1926,7 @@ int detectEdgeBurst(signalVector &burst, unsigned tsc, float threshold,
return rc;
}
-int detectAnyBurst(signalVector &burst, unsigned tsc, float threshold,
+int detectAnyBurst(const signalVector &burst, unsigned tsc, float threshold,
int sps, CorrType type, complex &amp, float &toa,
unsigned max_toa)
{
@@ -1957,7 +1958,7 @@ int detectAnyBurst(signalVector &burst, unsigned tsc, float threshold,
return rc;
}
-signalVector *downsampleBurst(signalVector &burst)
+signalVector *downsampleBurst(const signalVector &burst)
{
signalVector *in, *out;
@@ -2085,7 +2086,7 @@ static signalVector *demodCommon(signalVector &burst, int sps,
* delay filters. Symbol rotation and after always operates at 1 SPS.
*/
SoftVector *demodGmskBurst(signalVector &rxBurst, int sps,
- complex channel, float TOA)
+ complex channel, float TOA)
{
SoftVector *bits;
signalVector *dec;
diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h
index a10d551..a67b0ca 100644
--- a/Transceiver52M/sigProcLib.h
+++ b/Transceiver52M/sigProcLib.h
@@ -201,7 +201,7 @@ void scaleVector(signalVector &x,
@param windowLength The number of burst samples used to compute burst energy
@return The average power of the received burst.
*/
-float energyDetect(signalVector &rxBurst,
+float energyDetect(const signalVector &rxBurst,
unsigned windowLength);
/**
@@ -216,7 +216,7 @@ float energyDetect(signalVector &rxBurst,
negative value (-SignalError) on error,
zero (SIGERR_NONE) if no burst is detected
*/
-int detectRACHBurst(signalVector &burst,
+int detectRACHBurst(const signalVector &burst,
float threshold,
int sps,
complex &amplitude,
@@ -236,7 +236,7 @@ int detectRACHBurst(signalVector &burst,
negative value (-SignalError) on error,
zero (SIGERR_NONE) if no burst is detected
*/
-int analyzeTrafficBurst(signalVector &burst,
+int analyzeTrafficBurst(const signalVector &burst,
unsigned tsc,
float threshold,
int sps,
@@ -257,7 +257,7 @@ int analyzeTrafficBurst(signalVector &burst,
negative value (-SignalError) on error,
zero (SIGERR_NONE) if no burst is detected
*/
-int detectEdgeBurst(signalVector &burst,
+int detectEdgeBurst(const signalVector &burst,
unsigned tsc,
float threshold,
int sps,
@@ -278,7 +278,7 @@ int detectEdgeBurst(signalVector &burst,
negative value (-SignalError) on error,
zero (SIGERR_NONE) if no burst is detected
*/
-int detectAnyBurst(signalVector &burst,
+int detectAnyBurst(const signalVector &burst,
unsigned tsc,
float threshold,
int sps,
@@ -292,7 +292,7 @@ int detectAnyBurst(signalVector &burst,
@param burst Input burst of at least 624 symbols
@return Decimated signal vector of 156 symbols
*/
-signalVector *downsampleBurst(signalVector &burst);
+signalVector *downsampleBurst(const signalVector &burst);
/**
Decimate a vector.