diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-01-13 16:00:04 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-01-13 16:13:28 +0100 |
| commit | b0e54265ad3407375f98999d7cdcebfc51320443 (patch) | |
| tree | 2d1b8918dc52d5bc7b880f78dd5bc1cb51d59c03 /Transceiver52M/device/uhd/UHDDevice.cpp | |
| parent | 62c92805903b992493f7e435823011f7b11dcc34 (diff) | |
lms: Change radioDevice constructor arg name to avoid masking instance attr
channel number mangling based on multi-arfcn feature being enabled was
moved to generic radioDevice() to reuse code. Hence, the generic parent
constructor sets this->chans to 1 if multi-arfcn feature is requested.
However, LMSDevice constructor argument had same name as the class
instance attribute, taking preference. As a result, if multi-arfcn is
enabled in LMSDevice, the generic constructor first sets this->chans=1
but afterwards LMSDEvice constructor keeps calling .resize() with the
argument value "chans" instead of using this->chans.
Let's rename the argument in all radioDevice child class constructors to
avoid potential future bugs in all of them.
Change-Id: Id6c837e9133f22783dd92a81dfcc493e51bf2d21
Diffstat (limited to 'Transceiver52M/device/uhd/UHDDevice.cpp')
| -rw-r--r-- | Transceiver52M/device/uhd/UHDDevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 8bab882..5d267c8 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -189,10 +189,10 @@ static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg) #endif uhd_device::uhd_device(size_t tx_sps, size_t rx_sps, - InterfaceType iface, size_t chans, double lo_offset, + InterfaceType iface, size_t chan_num, double lo_offset, const std::vector<std::string>& tx_paths, const std::vector<std::string>& rx_paths) - : RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), + : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), tx_gain_min(0.0), tx_gain_max(0.0), rx_gain_min(0.0), rx_gain_max(0.0), tx_spp(0), rx_spp(0), |