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

Transceiver: Don't stop TRX if pulling from OFF timeslot

Browse Source 
BTS may have any timeslot disabled, or may have not yet sent initial
SETSLOT cmd to properly configure the timeslot.

Change-Id: Icf62e5d1200c7a440f255bb46023cdbf61532b7f
This commit is contained in:
Pau Espin Pedrol
2019-09-06 15:01:26 +02:00
parent 0d56d75dbb
commit 923b4bc9a2
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Transceiver52M/Transceiver.cpp
View File

@@ -587,9 +587,11 @@ void writeToFile(radioVector *radio_burst, size_t chan)
/*
* Pull bursts from the FIFO and handle according to the slot
* and burst correlation type. Equalzation is currently disabled.
* returns true on success (bi filled), false on error (bi content undefined).
* returns 0 on success (bi filled), negative on error (bi content undefined):
* -ENOENT: timeslot is off (fn and tn in bi are filled),
* -EIO: read error
*/
bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
int Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
{
int rc;
struct estim_burst_params ebp;
@@ -605,7 +607,7 @@ bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
radioVector *radio_burst = mReceiveFIFO[chan]->read();
if (!radio_burst) {
LOGCHAN(chan, DMAIN, ERROR) << "ReceiveFIFO->read() returned no burst";
return false;
return -EIO;
}
/* Set time and determine correlation type */
@@ -635,7 +637,7 @@ bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
* Not even power level or noise calculation. */
if (type == OFF) {
delete radio_burst;
return false;
return -ENOENT;
}
/* Select the diversity channel with highest energy */
@@ -702,12 +704,12 @@ bool Transceiver::pullRadioVector(size_t chan, struct trx_ul_burst_ind *bi)
delete rxBurst;
delete radio_burst;
return true;
return 0;
ret_idle:
bi->idle = true;
delete radio_burst;
return true;
return 0;
}
void Transceiver::reset()
@@ -1032,9 +1034,15 @@ void Transceiver::logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi)
bool Transceiver::driveReceiveFIFO(size_t chan)
{
struct trx_ul_burst_ind bi;
int rc;
if (!pullRadioVector(chan, &bi))
return false;
if ((rc = pullRadioVector(chan, &bi)) < 0) {
if (rc == -ENOENT) { /* timeslot off, continue processing */
LOGCHAN(chan, DMAIN, DEBUG) << unsigned(bi.tn) << ":" << bi.fn << " timeslot is off";
return true;
}
return false; /* other errors: we want to stop the process */
}
if (!bi.idle)
logRxBurst(chan, &bi);