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

Transceiver52M: Start and stop all threads on POWERON/POWEROFF.

Browse Source 
This change reveals some issue with the UHD start/stop code. Specifically,
we get a failed assert in RadioInterface::pullBuffer() (num_rd == OUTCHUNK
with num_rd=0) with the POWERON/POWEROFF/POWERON sequence.
This commit is contained in:
Alexander Chemeris
2013-07-14 22:58:55 +04:00
parent f1c5b4f765
commit 9cddd4aa5d
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Transceiver52M/Transceiver.cpp
View File

@@ -85,7 +85,7 @@ Transceiver::Transceiver(int wBasePort, const char *TRXAddress,
mRxFreq = 0.0;
mFreqOffset = 0.0;
mPower = -10;
mPower = -20;
mEnergyThreshold = INIT_ENERGY_THRSHD;
prevFalseDetectionTime = mDriveLoop->getStartTime();
}
@@ -306,12 +306,6 @@ void Transceiver::start()
{
mRunning = true;
mControlServiceLoop.startThread((void*) this);
if (!mPrimary) {
mOn = true;
mFIFOServiceLoop.startThread((void*) this);
mTransmitPriorityQueueServiceLoop.startThread((void*) this);
}
}
void Transceiver::shutdown()
@@ -371,6 +365,15 @@ void Transceiver::driveControl()
if (strcmp(command,"POWEROFF")==0) {
// turn off transmitter/demod
sprintf(response,"RSP POWEROFF 0");
if (mOn) {
// Stop radio interface threads.
mOn = false;
mFIFOServiceLoop.shutdown();
mTransmitPriorityQueueServiceLoop.shutdown();
mRadioInterface->stop();
mDriveLoop->stop();
}
}
else if (strcmp(command,"POWERON")==0) {
// turn on transmitter/demod
@@ -378,14 +381,15 @@ void Transceiver::driveControl()
sprintf(response,"RSP POWERON 1");
else {
sprintf(response,"RSP POWERON 0");
if (mPrimary && !mOn) {
if (!mOn) {
// Prepare for thread start
mPower = -20;
mRadioInterface->start();
mDriveLoop->startThread();
mDriveLoop->start();
mDriveLoop->writeClockInterface();
generateRACHSequence(*gsmPulse,mSamplesPerSymbol);
if (mPrimary) {
generateRACHSequence(*gsmPulse,mSamplesPerSymbol);
}
// Start radio interface threads.
mOn = true;