From c785fb130a0ae4e5ae23ccc7817d03c551cf8fdc Mon Sep 17 00:00:00 2001 From: Joachim Steiger Date: Tue, 16 Apr 2019 19:04:37 +0200 Subject: lms: properly call close if set_antennas() fails, add some comments Change-Id: I9ebe986ee3a15842a15853424ee98e9a2fa6a5df --- Transceiver52M/device/lms/LMSDevice.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 34ad6e8..05904e8 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -222,6 +222,7 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels) goto out_close; } + /* set samplerate */ if (LMS_GetSampleRateRange(m_lms_dev, LMS_CH_RX, &range_sr)) goto out_close; print_range("Sample Rate", &range_sr); @@ -237,9 +238,10 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels) /* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */ ts_offset = static_cast(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */ + /* configure antennas */ if (!set_antennas()) { LOGC(DDEV, ALERT) << "LMS antenna setting failed"; - return -1; + goto out_close; } samplesRead = 0; @@ -281,6 +283,7 @@ bool LMSDevice::start() if (!do_calib(i)) return false; + /* configure Streams */ m_lms_stream_rx[i] = {}; m_lms_stream_rx[i].isTx = false; m_lms_stream_rx[i].channel = i; -- cgit v1.2.3