From e94b1f4827f380e4a46cc15818bb2445ccfd9885 Mon Sep 17 00:00:00 2001 From: Thomas Tsou Date: Mon, 23 May 2011 12:02:56 -0700 Subject: [PATCH] uhd: disable adaptive buffering in 52 MHz transceiver Similar to the non-52 Mhz case, 589dd9091ef594ef6ef5804fbf6bfa70f3f02858 This drastically reduces underruns on the E100. Signed-off-by: Thomas Tsou --- public-trunk/Transceiver52M/Transceiver.cpp | 2 ++ public-trunk/Transceiver52M/runTransceiver.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public-trunk/Transceiver52M/Transceiver.cpp b/public-trunk/Transceiver52M/Transceiver.cpp index ff845dc..57ff81f 100644 --- a/public-trunk/Transceiver52M/Transceiver.cpp +++ b/public-trunk/Transceiver52M/Transceiver.cpp @@ -712,6 +712,7 @@ void Transceiver::driveTransmitFIFO() while (radioClock->get() + mTransmitLatency > mTransmitDeadlineClock) { // if underrun, then we're not providing bursts to radio/USRP fast // enough. Need to increase latency by one GSM frame. +#ifndef USE_UHD if (mRadioInterface->isUnderrun()) { // only do latency update every 10 frames, so we don't over update if (radioClock->get() > mLatencyUpdateTime + GSM::Time(10,0)) { @@ -731,6 +732,7 @@ void Transceiver::driveTransmitFIFO() } } } +#endif // time to push burst to transmit FIFO pushRadioVector(mTransmitDeadlineClock); mTransmitDeadlineClock.incTN(); diff --git a/public-trunk/Transceiver52M/runTransceiver.cpp b/public-trunk/Transceiver52M/runTransceiver.cpp index fe2454b..82fadfd 100644 --- a/public-trunk/Transceiver52M/runTransceiver.cpp +++ b/public-trunk/Transceiver52M/runTransceiver.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } RadioInterface* radio = new RadioInterface(usrp,3); - Transceiver *trx = new Transceiver(5700,"127.0.0.1",SAMPSPERSYM,GSM::Time(2,0),radio); + Transceiver *trx = new Transceiver(5700,"127.0.0.1",SAMPSPERSYM,GSM::Time(3,0),radio); trx->receiveFIFO(radio->receiveFIFO()); trx->start();