diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-06-13 23:32:42 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-06-13 23:32:42 +0200 |
commit | 35a067ea7c0d6fccbc7667bce49e495eef597e20 (patch) | |
tree | 9cefe924b4363ba3ee23df92b8a8f57ca0028212 /Transceiver52M | |
parent | 9939ccd0ded4d8e6483e1468f2aa446366a4f2ac (diff) |
lms: Fix coding stylelaforge/lime
In Change-Id Ib2fca81b76d027b08e2891056fa076d071597783 we introduced
some coding style violations. Let's make newly-added code follows
standard Osmocom coding style.
Change-Id: Ib7ddd275014f03a2eed3cddc02b1356e2b00c0bc
Diffstat (limited to 'Transceiver52M')
-rw-r--r-- | Transceiver52M/device/lms/LMSDevice.cpp | 20 | ||||
-rw-r--r-- | Transceiver52M/device/lms/LMSDevice.h | 1 | ||||
-rw-r--r-- | Transceiver52M/device/uhd/UHDDevice.cpp | 1 |
3 files changed, 10 insertions, 12 deletions
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index c4d5f96..815a4c5 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -100,19 +100,19 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels) LMS_RegisterLogHandler(&lms_log_callback); - if ((n = LMS_GetDeviceList(NULL)) < 0) - LOG(ERROR) << "LMS_GetDeviceList(NULL) failed"; - LOG(DEBUG) << "Devices found: " << n; - if (n < 1) - return -1; + if ((n = LMS_GetDeviceList(NULL)) < 0) + LOG(ERROR) << "LMS_GetDeviceList(NULL) failed"; + LOG(DEBUG) << "Devices found: " << n; + if (n < 1) + return -1; - info_list = new lms_info_str_t[n]; + info_list = new lms_info_str_t[n]; - if (LMS_GetDeviceList(info_list) < 0) //Populate device list - LOG(ERROR) << "LMS_GetDeviceList(info_list) failed"; + if (LMS_GetDeviceList(info_list) < 0) + LOG(ERROR) << "LMS_GetDeviceList(info_list) failed"; - for (i = 0; i < n; i++) //print device list - LOG(DEBUG) << "Device [" << i << "]: " << info_list[i]; + for (i = 0; i < n; i++) + LOG(DEBUG) << "Device [" << i << "]: " << info_list[i]; rc = LMS_Open(&m_lms_dev, info_list[0], NULL); if (rc != 0) { diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 7d8d44b..349efbb 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -46,7 +46,6 @@ private: std::vector<uint32_t> m_last_tx_underruns; std::vector<uint32_t> m_last_tx_overruns; - size_t chans; double actualSampleRate; ///< the actual USRP sampling rate unsigned long long samplesRead; ///< number of samples read from LMS diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index e8cec68..4af8f87 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -282,7 +282,6 @@ private: enum TxWindowType tx_window; enum uhd_dev_type dev_type; - size_t rx_sps, chans; double tx_rate, rx_rate; double tx_gain_min, tx_gain_max; |