<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12245">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LMSDevice: make use of dev-args in osmo-trx.cfg<br><br>Allow selecting a specific LimeSDR device by setting dev-args in the<br>config file. Split up the given dev-args address by comma and select<br>the device where all substrings can be found.<br><br>I could not test this with real hardware, but I have added a test case<br>to make sure this works as expected.<br><br>Related: OS#3654<br>Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852<br>---<br>M .gitignore<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>A tests/Transceiver52M/LMSDeviceTest.cpp<br>M tests/Transceiver52M/Makefile.am<br>M tests/testsuite.at<br>5 files changed, 98 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index ad4c4e3..f163fb6 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -18,6 +18,7 @@</span><br><span> tests/CommonLibs/VectorTest</span><br><span> tests/CommonLibs/PRBSTest</span><br><span> tests/Transceiver52M/convolve_test</span><br><span style="color: hsl(120, 100%, 40%);">+tests/Transceiver52M/LMSDeviceTest</span><br><span> </span><br><span> # automake/autoconf</span><br><span> *.in</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index 5e21894..270bd4a 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include "Logger.h"</span><br><span> #include "Threads.h"</span><br><span> #include "LMSDevice.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "Utils.h"</span><br><span> </span><br><span> #include <lime/LimeSuite.h></span><br><span> </span><br><span>@@ -95,6 +96,35 @@</span><br><span> << " Step=" << range->step;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Find the device string that matches all filters from \a args.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] info_list device addresses found by LMS_GetDeviceList()</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] count length of info_list</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] args dev-args value from osmo-trx.cfg, containing comma separated key=value pairs</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return index of first matching device or -1 (no match) */</span><br><span style="color: hsl(120, 100%, 40%);">+int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i, j;</span><br><span style="color: hsl(120, 100%, 40%);">+ vector<string> filters;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ filters = comma_delimited_to_vector(args.c_str());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* iterate over device addresses */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i=0; i < count; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* check if all filters match */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool match = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (j=0; j < filters.size(); j++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strstr(info_list[i], filters[j].c_str())) {</span><br><span style="color: hsl(120, 100%, 40%);">+ match = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ if (match)</span><br><span style="color: hsl(120, 100%, 40%);">+ return i;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int LMSDevice::open(const std::string &args, int ref, bool swap_channels)</span><br><span> {</span><br><span> //lms_info_str_t dev_str;</span><br><span>@@ -103,7 +133,7 @@</span><br><span> float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx;</span><br><span> uint16_t dac_val;</span><br><span> unsigned int i, n;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc, dev_id;</span><br><span> </span><br><span> LOGC(DDEV, INFO) << "Opening LMS device..";</span><br><span> </span><br><span>@@ -123,7 +153,15 @@</span><br><span> for (i = 0; i < n; i++)</span><br><span> LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = LMS_Open(&m_lms_dev, info_list[0], NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ dev_id = info_list_find(info_list, n, args);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dev_id == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, ERROR) << "No LMS device found with address '" << args << "'";</span><br><span style="color: hsl(120, 100%, 40%);">+ delete[] info_list;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</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%);">+ LOGC(DDEV, INFO) << "Using device[" << dev_id << "]";</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = LMS_Open(&m_lms_dev, info_list[dev_id], NULL);</span><br><span> if (rc != 0) {</span><br><span> LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)";</span><br><span> delete [] info_list;</span><br><span>diff --git a/tests/Transceiver52M/LMSDeviceTest.cpp b/tests/Transceiver52M/LMSDeviceTest.cpp</span><br><span>new file mode 100644</span><br><span>index 0000000..d40a7ec</span><br><span>--- /dev/null</span><br><span>+++ b/tests/Transceiver52M/LMSDeviceTest.cpp</span><br><span>@@ -0,0 +1,41 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <assert.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <lime/LimeSuite.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C"</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+size_t osmo_strlcpy(char *dst, const char *src, size_t siz);</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%);">+int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+using namespace std;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int main(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int count;</span><br><span style="color: hsl(120, 100%, 40%);">+ lms_info_str_t* info_list;</span><br><span style="color: hsl(120, 100%, 40%);">+ std::string args;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* two fake entries for info_list */</span><br><span style="color: hsl(120, 100%, 40%);">+ count = 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ info_list = new lms_info_str_t[count];</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(info_list[0], "LimeSDR Mini, addr=24607:1337, serial=FAKESERIAL0001", sizeof(lms_info_str_t));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(info_list[1], "LimeSDR Mini, addr=24607:1338, serial=FAKESERIAL0002", sizeof(lms_info_str_t));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* find second entry by args filter */</span><br><span style="color: hsl(120, 100%, 40%);">+ args = "serial=FAKESERIAL0002,LimeSDR Mini";</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(info_list_find(info_list, count, args) == 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* empty args -> first entry */</span><br><span style="color: hsl(120, 100%, 40%);">+ args = "";</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(info_list_find(info_list, count, args) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* not matching args -> -1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ args = "serial=NOTMATCHING";</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(info_list_find(info_list, count, args) == -1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* clean up */</span><br><span style="color: hsl(120, 100%, 40%);">+ delete[] info_list;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am</span><br><span>index 06db5b0..df3ae57 100644</span><br><span>--- a/tests/Transceiver52M/Makefile.am</span><br><span>+++ b/tests/Transceiver52M/Makefile.am</span><br><span>@@ -16,3 +16,13 @@</span><br><span> if HAVE_SSE4_1</span><br><span> convolve_test_CFLAGS += $(SIMD_FLAGS)</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if DEVICE_LMS</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_PROGRAMS += LMSDeviceTest</span><br><span style="color: hsl(120, 100%, 40%);">+LMSDeviceTest_SOURCES = LMSDeviceTest.cpp</span><br><span style="color: hsl(120, 100%, 40%);">+LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+LMSDeviceTest_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/Transceiver52M/device/lms/libdevice.la \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(COMMON_LA)</span><br><span style="color: hsl(120, 100%, 40%);">+LMSDeviceTest_CPPFLAGS = $(AM_CPPFLAGS) $(LMS_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>diff --git a/tests/testsuite.at b/tests/testsuite.at</span><br><span>index f84225e..22de782 100644</span><br><span>--- a/tests/testsuite.at</span><br><span>+++ b/tests/testsuite.at</span><br><span>@@ -1,6 +1,12 @@</span><br><span> AT_INIT</span><br><span> AT_BANNER([Regression tests.])</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AT_SETUP([LMSDeviceTest])</span><br><span style="color: hsl(120, 100%, 40%);">+AT_KEYWORDS([LMSDeviceTest])</span><br><span style="color: hsl(120, 100%, 40%);">+AT_SKIP_IF([! test -e $abs_top_builddir/tests/Transceiver52M/LMSDeviceTest])</span><br><span style="color: hsl(120, 100%, 40%);">+AT_CHECK([$abs_top_builddir/tests/Transceiver52M/LMSDeviceTest], [], [], [])</span><br><span style="color: hsl(120, 100%, 40%);">+AT_CLEANUP</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AT_SETUP([BitVectorTest])</span><br><span> AT_KEYWORDS([BitVectorTest])</span><br><span> cat $abs_srcdir/CommonLibs/BitVectorTest.ok > expout</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12245">change 12245</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/12245"/><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: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 </div>
<div style="display:none"> Gerrit-Change-Number: 12245 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>