From e2ac20a96edbac405a5543aa56c8e0ee39123060 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 13 Sep 2019 17:54:25 +0200 Subject: UHDDevice: Drop unneeded MULTI_ARFCN checks After previous changes, radioInterfaceMulti is expected to handle channel conversion correctly, so it will always use chan 0 for all these functions. This simplifies code in radioDevice avoiding need to add checks to all devices supporting multi-arfcn in the future. Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba --- Transceiver52M/device/uhd/UHDDevice.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 3b59291..809bade 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -247,9 +247,6 @@ void uhd_device::set_rates() double uhd_device::setTxGain(double db, size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= tx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan; return 0.0f; @@ -281,9 +278,6 @@ double uhd_device::setTxGain(double db, size_t chan) double uhd_device::setRxGain(double db, size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= rx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; @@ -299,9 +293,6 @@ double uhd_device::setRxGain(double db, size_t chan) double uhd_device::getRxGain(size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= rx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; @@ -312,9 +303,6 @@ double uhd_device::getRxGain(size_t chan) double uhd_device::getTxGain(size_t chan) { - if (iface == MULTI_ARFCN) - chan = 0; - if (chan >= tx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; -- cgit v1.2.3