paulmataruso/osmo-trx
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-trx.git synced 2025-11-02 05:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transceiver: Move calculation of normalized values (rssiOffset) to pullRadioVector()

Browse Source 
That's where all the filling logic happens, while in driveReceiveFIFO we
mostly want to take the burst, generate a message and sent it over the
socket.
In pullRadioVector this way we always provide normalized values based on
user configuration (VTY rssi-offset).

Related: OS#4006
Change-Id: I1ee28daf21dc287bec564d45d58086d63655c0f6
This commit is contained in:
Pau Espin Pedrol
2019-07-01 13:56:17 +02:00
parent 0e67cf24eb
commit 607a414967
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Transceiver52M/Transceiver.cpp
View File

@@ -606,19 +606,19 @@ bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
burst = radio_burst->getVector(max_i);
avg = sqrt(avg / radio_burst->chans());
bi->rssi = 20.0 * log10(rxFullScale / avg);
bi->rssi = 20.0 * log10(rxFullScale / avg) + rssiOffset;
if (type == IDLE) {
/* Update noise levels */
state->mNoises.insert(avg);
state->mNoiseLev = state->mNoises.avg();
bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev);
bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset;
delete radio_burst;
return false;
} else {
/* Do not update noise levels */
bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev);
bi->noise = 20.0 * log10(rxFullScale / state->mNoiseLev) + rssiOffset;
}
unsigned max_toa = (type == RACH || type == EXT_RACH) ?
@@ -906,22 +906,21 @@ void Transceiver::driveReceiveRadio()
}
}
void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi, double dbm)
void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi)
{
LOG(DEBUG) << std::fixed << std::right
<< " chan: " << chan
<< " time: " << bi->burstTime
<< " RSSI: " << std::setw(5) << std::setprecision(1) << bi->rssi
<< "dBFS/" << std::setw(6) << -dbm << "dBm"
<< " noise: " << std::setw(5) << std::setprecision(1) << bi->noise
<< "dBFS/" << std::setw(6) << -(bi->noise + rssiOffset) << "dBm"
<< " RSSI: " << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset)
<< "dBFS/" << std::setw(6) << -bi->rssi << "dBm"
<< " noise: " << std::setw(5) << std::setprecision(1) << (bi->noise - rssiOffset)
<< "dBFS/" << std::setw(6) << -bi->noise << "dBm"
<< " TOA: " << std::setw(5) << std::setprecision(2) << bi->toa
<< " bits: " << *(bi->rxBurst);
}
void Transceiver::driveReceiveFIFO(size_t chan)
{
double dBm; // in dBm
int TOAint; // in 1/256 symbols
struct trx_ul_burst_ind bi;
@@ -932,8 +931,7 @@ void Transceiver::driveReceiveFIFO(size_t chan)
// Convert -1..+1 soft bits to 0..1 soft bits
vectorSlicer(bi.rxBurst);
dBm = bi.rssi + rssiOffset;
logRxBurst(chan, &bi, dBm);
logRxBurst(chan, &bi);
TOAint = (int) (bi.toa * 256.0 + 0.5); // round to closest integer
@@ -943,7 +941,7 @@ void Transceiver::driveReceiveFIFO(size_t chan)
pkt->common.reserved = 0;
pkt->common.tn = bi.burstTime.TN();
osmo_store32be(bi.burstTime.FN(), &pkt->common.fn);
pkt->v0.rssi = dBm;
pkt->v0.rssi = bi.rssi;
osmo_store16be(TOAint, &pkt->v0.toa);
SoftVector::iterator burstItr = bi.rxBurst->begin();

2
Transceiver52M/Transceiver.h
View File

@@ -271,7 +271,7 @@ protected:
/** set priority on current thread */
void setPriority(float prio = 0.5) { mRadioInterface->setPriority(prio); }
void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi, double dbm);
void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi);
};
void *RxUpperLoopAdapter(TransceiverChannel *);