VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

XTRX input: MI to SI transition fixes

This commit is contained in:
f4exb 2019-01-01 10:55:20 +01:00
parent a9211ac298
commit 61baf75471
1 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
plugins/samplesource/xtrxinput/xtrxinput.cpp
View File

@ -330,7 +330,7 @@ bool XTRXInput::start()
if (needsStart) if (needsStart)
{ {
qDebug("XTRXInput::start: (re)sart thread"); qDebug("XTRXInput::start: (re)start thread");
xtrxInputThread->startWork(); xtrxInputThread->startWork();
} }
@ -357,7 +357,8 @@ void XTRXInput::stop()
return; return;
} }
int requestedChannel = m_deviceAPI->getItemIndex(); // channel to remove int removedChannel = m_deviceAPI->getItemIndex(); // channel to remove
int requestedChannel = removedChannel ^ 1; // channel to keep (opposite channel)
XTRXInputThread *xtrxInputThread = findThread(); XTRXInputThread *xtrxInputThread = findThread();
if (xtrxInputThread == 0) { // no thread allocated if (xtrxInputThread == 0) { // no thread allocated
@ -385,26 +386,13 @@ void XTRXInput::stop()
{ {
qDebug("XTRXInput::stop: MI mode. Reduce by deleting and re-creating the thread"); qDebug("XTRXInput::stop: MI mode. Reduce by deleting and re-creating the thread");
xtrxInputThread->stopWork(); xtrxInputThread->stopWork();
SampleSinkFifo **fifos = new SampleSinkFifo*[2];
unsigned int *log2Decims = new unsigned int[2];
for (int i = 0; i < 2; i++) // save original FIFO references
{
fifos[i] = xtrxInputThread->getFifo(i);
log2Decims[i] = xtrxInputThread->getLog2Decimation(i);
}
delete xtrxInputThread; delete xtrxInputThread;
m_XTRXInputThread = 0; m_XTRXInputThread = 0;
xtrxInputThread = new XTRXInputThread(m_deviceShared.m_dev->getDevice(), 1, requestedChannel ^ 1); // leave opposite channel xtrxInputThread = new XTRXInputThread(m_deviceShared.m_dev->getDevice(), 1, requestedChannel);
m_XTRXInputThread = xtrxInputThread; // take ownership m_XTRXInputThread = xtrxInputThread; // take ownership
xtrxInputThread->setFifo(requestedChannel, &m_sampleFifo);
for (int i = 0; i < nbOriginalChannels-1; i++) // restore original FIFO references xtrxInputThread->setLog2Decimation(requestedChannel, m_settings.m_log2SoftDecim);
{
xtrxInputThread->setFifo(i, fifos[i]);
xtrxInputThread->setLog2Decimation(i, log2Decims[i]);
}
// remove old thread address from buddies (reset in all buddies). The address being held only in the owning source. // remove old thread address from buddies (reset in all buddies). The address being held only in the owning source.
const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies(); const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies();
@ -415,10 +403,7 @@ void XTRXInput::stop()
} }
xtrxInputThread->startWork(); xtrxInputThread->startWork();
applySettings(m_settings, true);
// was used as temporary storage:
delete[] fifos;
delete[] log2Decims;
} }
m_running = false; m_running = false;
@ -839,29 +824,34 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo
if ((m_settings.m_pwrmode != settings.m_pwrmode)) if ((m_settings.m_pwrmode != settings.m_pwrmode))
{ {
if (xtrx_val_set(m_deviceShared.m_dev->getDevice(), if (m_deviceShared.m_dev->getDevice() != 0)
XTRX_TRX, {
m_deviceShared.m_channel == 0 ? XTRX_CH_A : XTRX_CH_B, if (xtrx_val_set(m_deviceShared.m_dev->getDevice(),
XTRX_LMS7_PWR_MODE, XTRX_TRX,
settings.m_pwrmode) < 0) { m_deviceShared.m_channel == 0 ? XTRX_CH_A : XTRX_CH_B,
qCritical("XTRXInput::applySettings: could not set power mode %d", settings.m_pwrmode); XTRX_LMS7_PWR_MODE,
settings.m_pwrmode) < 0) {
qCritical("XTRXInput::applySettings: could not set power mode %d", settings.m_pwrmode);
}
} }
} }
if ((m_settings.m_extClock != settings.m_extClock) || if ((m_settings.m_extClock != settings.m_extClock) ||
(settings.m_extClock && (m_settings.m_extClockFreq != settings.m_extClockFreq)) || force) (settings.m_extClock && (m_settings.m_extClockFreq != settings.m_extClockFreq)) || force)
{ {
if (m_deviceShared.m_dev->getDevice() != 0)
xtrx_set_ref_clk(m_deviceShared.m_dev->getDevice(),
(settings.m_extClock) ? settings.m_extClockFreq : 0,
(settings.m_extClock) ? XTRX_CLKSRC_EXT : XTRX_CLKSRC_INT);
{ {
forwardClockSource = true; xtrx_set_ref_clk(m_deviceShared.m_dev->getDevice(),
doChangeSampleRate = true; (settings.m_extClock) ? settings.m_extClockFreq : 0,
doChangeFreq = true; (settings.m_extClock) ? XTRX_CLKSRC_EXT : XTRX_CLKSRC_INT);
qDebug("XTRXInput::applySettings: clock set to %s (Ext: %d Hz)", {
settings.m_extClock ? "external" : "internal", forwardClockSource = true;
settings.m_extClockFreq); doChangeSampleRate = true;
doChangeFreq = true;
qDebug("XTRXInput::applySettings: clock set to %s (Ext: %d Hz)",
settings.m_extClock ? "external" : "internal",
settings.m_extClockFreq);
}
} }
} }