pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15522 )
Change subject: UHDDevice: Drop unneeded MULTI_ARFCN checks
......................................................................
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
---
M Transceiver52M/device/uhd/UHDDevice.cpp
1 file changed, 0 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
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 @@
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::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::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::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;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15522
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ib2cd50a6ceaeedc6aaf3e1bb51d33b52911b6eba
Gerrit-Change-Number: 15522
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: laforge <lafo...@gnumonks.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
