Change in osmo-trx[master]: lms: Fix coding style

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Jun 13 21:33:36 UTC 2018


Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9623


Change subject: lms: Fix coding style
......................................................................

lms: Fix coding style

In Change-Id Ib2fca81b76d027b08e2891056fa076d071597783 we introduced
some coding style violations.  Let's make newly-added code follows
standard Osmocom coding style.

Change-Id: Ib7ddd275014f03a2eed3cddc02b1356e2b00c0bc
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
M Transceiver52M/device/uhd/UHDDevice.cpp
3 files changed, 10 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/9623/1

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 @@
 
 	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 @@
 	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 @@
 	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;

-- 
To view, visit https://gerrit.osmocom.org/9623
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7ddd275014f03a2eed3cddc02b1356e2b00c0bc
Gerrit-Change-Number: 9623
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180613/e003950d/attachment.htm>


More information about the gerrit-log mailing list