<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9618">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move set_antennas() from UHD to generic radioDevice base class<br><br>Change-Id: I806143e9db21f0be4dcc6a376b3a630be7aeb3ba<br>---<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/radioDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>4 files changed, 29 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index 99eed43..7b3479f 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -196,8 +196,6 @@</span><br><span>       inline double numberWritten() {</span><br><span>              return samplesWritten;</span><br><span>       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       std::vector < std::string > tx_paths, rx_paths;</span><br><span> };</span><br><span> </span><br><span> #endif // _LMS_DEVICE_H_</span><br><span>diff --git a/Transceiver52M/device/radioDevice.h b/Transceiver52M/device/radioDevice.h</span><br><span>index c5cd461..469b574 100644</span><br><span>--- a/Transceiver52M/device/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/radioDevice.h</span><br><span>@@ -19,6 +19,7 @@</span><br><span> #include <vector></span><br><span> </span><br><span> #include "GSMCommon.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "Logger.h"</span><br><span> </span><br><span> extern "C" {</span><br><span> #include "config_defs.h"</span><br><span>@@ -163,6 +164,34 @@</span><br><span>   virtual double numberRead()=0;</span><br><span>   virtual double numberWritten()=0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  std::vector<std::string> tx_paths, rx_paths;</span><br><span style="color: hsl(120, 100%, 40%);">+  bool set_antennas() {</span><br><span style="color: hsl(120, 100%, 40%);">+   unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     for (i = 0; i < tx_paths.size(); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+            if (tx_paths[i] == "")</span><br><span style="color: hsl(120, 100%, 40%);">+                      continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             LOG(DEBUG) << "Configuring channel " << i << " with antenna " << tx_paths[i];</span><br><span style="color: hsl(120, 100%, 40%);">+             if (!setTxAntenna(tx_paths[i], i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << tx_paths[i];</span><br><span style="color: hsl(120, 100%, 40%);">+                      return false;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   for (i = 0; i < rx_paths.size(); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+            if (rx_paths[i] == "")</span><br><span style="color: hsl(120, 100%, 40%);">+                      continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             LOG(DEBUG) << "Configuring channel " << i << " with antenna " << rx_paths[i];</span><br><span style="color: hsl(120, 100%, 40%);">+             if (!setRxAntenna(rx_paths[i], i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << rx_paths[i];</span><br><span style="color: hsl(120, 100%, 40%);">+                      return false;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+     LOG(INFO) << "Antennas configured successfully";</span><br><span style="color: hsl(120, 100%, 40%);">+      return true;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> };</span><br><span> </span><br><span> #endif</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index a0052c8..77a3446 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -291,7 +291,6 @@</span><br><span> </span><br><span>         std::vector<double> tx_gains, rx_gains;</span><br><span>        std::vector<double> tx_freqs, rx_freqs;</span><br><span style="color: hsl(0, 100%, 40%);">-   std::vector<std::string> tx_paths, rx_paths;</span><br><span>   size_t tx_spp, rx_spp;</span><br><span> </span><br><span>   bool started;</span><br><span>@@ -307,7 +306,6 @@</span><br><span>  void init_gains();</span><br><span>   void set_channels(bool swap);</span><br><span>        void set_rates();</span><br><span style="color: hsl(0, 100%, 40%);">-       bool set_antennas();</span><br><span>         bool parse_dev_type();</span><br><span>       bool flush_recv(size_t num_pkts);</span><br><span>    int check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls);</span><br><span>@@ -458,33 +456,6 @@</span><br><span>   LOG(INFO) << "Rates configured for " << desc.str;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool uhd_device::set_antennas()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-        unsigned int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < tx_paths.size(); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-              if (tx_paths[i] == "")</span><br><span style="color: hsl(0, 100%, 40%);">-                        continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               LOG(DEBUG) << "Configuring channel " << i << " with antenna " << tx_paths[i];</span><br><span style="color: hsl(0, 100%, 40%);">-               if (!setTxAntenna(tx_paths[i], i)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                    LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << tx_paths[i];</span><br><span style="color: hsl(0, 100%, 40%);">-                        return false;</span><br><span style="color: hsl(0, 100%, 40%);">-           }</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       for (i = 0; i < rx_paths.size(); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-              if (rx_paths[i] == "")</span><br><span style="color: hsl(0, 100%, 40%);">-                        continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               LOG(DEBUG) << "Configuring channel " << i << " with antenna " << rx_paths[i];</span><br><span style="color: hsl(0, 100%, 40%);">-               if (!setRxAntenna(rx_paths[i], i)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                    LOG(ALERT) << "Failed configuring channel " << i << " with antenna " << rx_paths[i];</span><br><span style="color: hsl(0, 100%, 40%);">-                        return false;</span><br><span style="color: hsl(0, 100%, 40%);">-           }</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-       LOG(INFO) << "Antennas configured successfully";</span><br><span style="color: hsl(0, 100%, 40%);">-        return true;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> double uhd_device::setTxGain(double db, size_t chan)</span><br><span> {</span><br><span>   if (iface == MULTI_ARFCN)</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 6304ea1..efdedb3 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -203,8 +203,6 @@</span><br><span>   inline double getSampleRate() { return actualSampleRate; }</span><br><span>   inline double numberRead() { return samplesRead; }</span><br><span>   inline double numberWritten() { return samplesWritten; }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  std::vector<std::string> tx_paths, rx_paths;</span><br><span> };</span><br><span> </span><br><span> #endif // _USRP_DEVICE_H_</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9618">change 9618</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9618"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I806143e9db21f0be4dcc6a376b3a630be7aeb3ba </div>
<div style="display:none"> Gerrit-Change-Number: 9618 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>