From 02d88d13808135f35b1cac7a44260e09affbb428 Mon Sep 17 00:00:00 2001 From: Thomas Tsou Date: Fri, 5 Apr 2013 15:36:30 -0400 Subject: Transceiver52M: Add UHD device type checking UHD device type was previously detected, but only categorized in terms of bus type, USB or Ethernet, and sample rate capability. With the number of supported device increasing, we can no longer easily group devices since we need to handle more and more device-specific peculiarities. Some of these factors are managed internally by the UHD driver, but other factors (e.g. timing offsets) are specific to a single device. Start by maintaining an enumerated list of relevant device types that we can use for applying device specific operations. Also rename the USB/Ethernet grouping to transmit window type because that's what it is. enum uhd_dev_type { USRP1, USRP2, B100, NUM_USRP_TYPES, }; Signed-off-by: Thomas Tsou --- Transceiver52M/Transceiver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Transceiver52M/Transceiver.cpp') diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index d030a48..7054dec 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -739,7 +739,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. - if (mRadioInterface->getBus() == RadioDevice::USB) { + if (mRadioInterface->getWindowType() == RadioDevice::TX_WINDOW_USRP1) { if (mRadioInterface->isUnderrun()) { // only update latency at the defined frame interval if (radioClock->get() > mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL)) { -- cgit v1.2.3