cellular-infrastructure
/
osmo-trx
mirror of https://gerrit.osmocom.org/osmo-trx
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

transceiver: Do not pass transceiver state struct to function where it's not used.

This commit is contained in:
Alexander Chemeris 2016-04-20 08:42:58 +03:00 committed by Tom Tsou
parent 1ab5e7f7bc
commit 9664c3a6e7
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Transceiver52M/Transceiver.cpp
View File

@ -531,8 +531,8 @@ Transceiver::CorrType Transceiver::expectedCorrType(GSM::Time currTime,
}
}
int Transceiver::detectBurst(TransceiverState *state, signalVector &burst,
complex &amp, float &toa, CorrType type)
int Transceiver::detectBurst(signalVector &burst,
complex &amp, float &toa, CorrType type)
{
float threshold = 5.0, rc = 0;
@ -567,8 +567,7 @@ int Transceiver::detectBurst(TransceiverState *state, signalVector &burst,
/*
* Demodulate GMSK by direct rotation and soft slicing.
*/
SoftVector *Transceiver::demodulate(TransceiverState *state,
signalVector &burst, complex amp,
SoftVector *Transceiver::demodulate(signalVector &burst, complex amp,
float toa, CorrType type)
{
if (type == EDGE)
@ -666,7 +665,7 @@ SoftVector *Transceiver::pullRadioVector(GSM::Time &wTime, double &RSSI, bool &i
}
/* Detect normal or RACH bursts */
rc = detectBurst(state, *burst, amp, toa, type);
rc = detectBurst(*burst, amp, toa, type);
if (rc > 0) {
type = (CorrType) rc;
@ -683,7 +682,7 @@ SoftVector *Transceiver::pullRadioVector(GSM::Time &wTime, double &RSSI, bool &i
timingOffset = toa / mSPSRx;
bits = demodulate(state, *burst, amp, toa, type);
bits = demodulate(*burst, amp, toa, type);
delete radio_burst;
return bits;

4
Transceiver52M/Transceiver.h
View File

@ -212,11 +212,11 @@ private:
void writeClockInterface(void);
/** Detectbursts */
int detectBurst(TransceiverState *state, signalVector &burst,
int detectBurst(signalVector &burst,
complex &amp, float &toa, CorrType type);
/** Demodulate burst and output soft bits */
SoftVector *demodulate(TransceiverState *state, signalVector &burst,
SoftVector *demodulate(signalVector &burst,
complex amp, float toa, CorrType type);
int mSPSTx; ///< number of samples per Tx symbol