aboutsummaryrefslogtreecommitdiffstats
path: root/Transceiver52M/radioInterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Transceiver52M/radioInterface.cpp')
-rw-r--r--Transceiver52M/radioInterface.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp
index f01b528..e7230d8 100644
--- a/Transceiver52M/radioInterface.cpp
+++ b/Transceiver52M/radioInterface.cpp
@@ -118,11 +118,13 @@ bool RadioInterface::tuneRx(double freq)
void RadioInterface::start()
{
LOG(INFO) << "starting radio interface...";
+#ifdef USRP1
mAlignRadioServiceLoopThread.start((void * (*)(void*))AlignRadioServiceLoopAdapter,
(void*)this);
- mRadio->start();
+#endif
writeTimestamp = mRadio->initialWriteTimestamp();
readTimestamp = mRadio->initialReadTimestamp();
+ mRadio->start();
LOG(DEBUG) << "Radio started";
mRadio->updateAlignment(writeTimestamp-10000);
mRadio->updateAlignment(writeTimestamp-10000);
@@ -134,6 +136,7 @@ void RadioInterface::start()
}
+#ifdef USRP1
void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
{
while (1) {
@@ -147,6 +150,7 @@ void RadioInterface::alignRadio() {
sleep(60);
mRadio->updateAlignment(writeTimestamp+ (TIMESTAMP) 10000);
}
+#endif
void RadioInterface::driveTransmitRadio(signalVector &radioBurst, bool zeroBurst) {
@@ -218,14 +222,6 @@ bool RadioInterface::isUnderrun()
return retVal;
}
-void RadioInterface::attach(RadioDevice *wRadio, int wRadioOversampling)
-{
- if (!mOn) {
- mRadio = wRadio;
- mRadioOversampling = SAMPSPERSYM;
- }
-}
-
double RadioInterface::setRxGain(double dB)
{
if (mRadio)