LMSDevice: make use of dev-args in osmo-trx.cfg
Allow selecting a specific LimeSDR device by setting dev-args in the config file. Split up the given dev-args address by comma and select the device where all substrings can be found. I could not test this with real hardware, but I have added a test case to make sure this works as expected. Related: OS#3654 Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852
This commit is contained in:
parent
8d9a05ce5b
commit
871713bf6a
|
@ -18,6 +18,7 @@ tests/CommonLibs/URLEncodeTest
|
||||||
tests/CommonLibs/VectorTest
|
tests/CommonLibs/VectorTest
|
||||||
tests/CommonLibs/PRBSTest
|
tests/CommonLibs/PRBSTest
|
||||||
tests/Transceiver52M/convolve_test
|
tests/Transceiver52M/convolve_test
|
||||||
|
tests/Transceiver52M/LMSDeviceTest
|
||||||
|
|
||||||
# automake/autoconf
|
# automake/autoconf
|
||||||
*.in
|
*.in
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "Logger.h"
|
#include "Logger.h"
|
||||||
#include "Threads.h"
|
#include "Threads.h"
|
||||||
#include "LMSDevice.h"
|
#include "LMSDevice.h"
|
||||||
|
#include "Utils.h"
|
||||||
|
|
||||||
#include <lime/LimeSuite.h>
|
#include <lime/LimeSuite.h>
|
||||||
|
|
||||||
|
@ -95,6 +96,35 @@ static void print_range(const char* name, lms_range_t *range)
|
||||||
<< " Step=" << range->step;
|
<< " Step=" << range->step;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*! Find the device string that matches all filters from \a args.
|
||||||
|
* \param[in] info_list device addresses found by LMS_GetDeviceList()
|
||||||
|
* \param[in] count length of info_list
|
||||||
|
* \param[in] args dev-args value from osmo-trx.cfg, containing comma separated key=value pairs
|
||||||
|
* \return index of first matching device or -1 (no match) */
|
||||||
|
int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args)
|
||||||
|
{
|
||||||
|
unsigned int i, j;
|
||||||
|
vector<string> filters;
|
||||||
|
|
||||||
|
filters = comma_delimited_to_vector(args.c_str());
|
||||||
|
|
||||||
|
/* iterate over device addresses */
|
||||||
|
for (i=0; i < count; i++) {
|
||||||
|
/* check if all filters match */
|
||||||
|
bool match = true;
|
||||||
|
for (j=0; j < filters.size(); j++) {
|
||||||
|
if (!strstr(info_list[i], filters[j].c_str())) {
|
||||||
|
match = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (match)
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
|
int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
|
||||||
{
|
{
|
||||||
//lms_info_str_t dev_str;
|
//lms_info_str_t dev_str;
|
||||||
|
@ -103,7 +133,7 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
|
||||||
float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx;
|
float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx;
|
||||||
uint16_t dac_val;
|
uint16_t dac_val;
|
||||||
unsigned int i, n;
|
unsigned int i, n;
|
||||||
int rc;
|
int rc, dev_id;
|
||||||
|
|
||||||
LOGC(DDEV, INFO) << "Opening LMS device..";
|
LOGC(DDEV, INFO) << "Opening LMS device..";
|
||||||
|
|
||||||
|
@ -123,7 +153,15 @@ int LMSDevice::open(const std::string &args, int ref, bool swap_channels)
|
||||||
for (i = 0; i < n; i++)
|
for (i = 0; i < n; i++)
|
||||||
LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i];
|
LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i];
|
||||||
|
|
||||||
rc = LMS_Open(&m_lms_dev, info_list[0], NULL);
|
dev_id = info_list_find(info_list, n, args);
|
||||||
|
if (dev_id == -1) {
|
||||||
|
LOGC(DDEV, ERROR) << "No LMS device found with address '" << args << "'";
|
||||||
|
delete[] info_list;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGC(DDEV, INFO) << "Using device[" << dev_id << "]";
|
||||||
|
rc = LMS_Open(&m_lms_dev, info_list[dev_id], NULL);
|
||||||
if (rc != 0) {
|
if (rc != 0) {
|
||||||
LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)";
|
LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)";
|
||||||
delete [] info_list;
|
delete [] info_list;
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
#include <assert.h>
|
||||||
|
#include <lime/LimeSuite.h>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
size_t osmo_strlcpy(char *dst, const char *src, size_t siz);
|
||||||
|
}
|
||||||
|
|
||||||
|
int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args);
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
unsigned int count;
|
||||||
|
lms_info_str_t* info_list;
|
||||||
|
std::string args;
|
||||||
|
|
||||||
|
/* two fake entries for info_list */
|
||||||
|
count = 2;
|
||||||
|
info_list = new lms_info_str_t[count];
|
||||||
|
osmo_strlcpy(info_list[0], "LimeSDR Mini, addr=24607:1337, serial=FAKESERIAL0001", sizeof(lms_info_str_t));
|
||||||
|
osmo_strlcpy(info_list[1], "LimeSDR Mini, addr=24607:1338, serial=FAKESERIAL0002", sizeof(lms_info_str_t));
|
||||||
|
|
||||||
|
/* find second entry by args filter */
|
||||||
|
args = "serial=FAKESERIAL0002,LimeSDR Mini";
|
||||||
|
assert(info_list_find(info_list, count, args) == 1);
|
||||||
|
|
||||||
|
/* empty args -> first entry */
|
||||||
|
args = "";
|
||||||
|
assert(info_list_find(info_list, count, args) == 0);
|
||||||
|
|
||||||
|
/* not matching args -> -1 */
|
||||||
|
args = "serial=NOTMATCHING";
|
||||||
|
assert(info_list_find(info_list, count, args) == -1);
|
||||||
|
|
||||||
|
/* clean up */
|
||||||
|
delete[] info_list;
|
||||||
|
return 0;
|
||||||
|
}
|
|
@ -16,3 +16,13 @@ endif
|
||||||
if HAVE_SSE4_1
|
if HAVE_SSE4_1
|
||||||
convolve_test_CFLAGS += $(SIMD_FLAGS)
|
convolve_test_CFLAGS += $(SIMD_FLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if DEVICE_LMS
|
||||||
|
noinst_PROGRAMS += LMSDeviceTest
|
||||||
|
LMSDeviceTest_SOURCES = LMSDeviceTest.cpp
|
||||||
|
LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS)
|
||||||
|
LMSDeviceTest_LDADD = \
|
||||||
|
$(top_builddir)/Transceiver52M/device/lms/libdevice.la \
|
||||||
|
$(COMMON_LA)
|
||||||
|
LMSDeviceTest_CPPFLAGS = $(AM_CPPFLAGS) $(LMS_CFLAGS)
|
||||||
|
endif
|
||||||
|
|
|
@ -1,6 +1,12 @@
|
||||||
AT_INIT
|
AT_INIT
|
||||||
AT_BANNER([Regression tests.])
|
AT_BANNER([Regression tests.])
|
||||||
|
|
||||||
|
AT_SETUP([LMSDeviceTest])
|
||||||
|
AT_KEYWORDS([LMSDeviceTest])
|
||||||
|
AT_SKIP_IF([! test -e $abs_top_builddir/tests/Transceiver52M/LMSDeviceTest])
|
||||||
|
AT_CHECK([$abs_top_builddir/tests/Transceiver52M/LMSDeviceTest], [], [], [])
|
||||||
|
AT_CLEANUP
|
||||||
|
|
||||||
AT_SETUP([BitVectorTest])
|
AT_SETUP([BitVectorTest])
|
||||||
AT_KEYWORDS([BitVectorTest])
|
AT_KEYWORDS([BitVectorTest])
|
||||||
cat $abs_srcdir/CommonLibs/BitVectorTest.ok > expout
|
cat $abs_srcdir/CommonLibs/BitVectorTest.ok > expout
|
||||||
|
|
Loading…
Reference in New Issue