<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12303">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Verified
Vadim Yanitskiy: 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;">lms: Fix build against LimeSuite > 18.10<br><br>LimeSuite dc124e4e2ed9b549b142410af172f0592f9f0c23 > 18.10 broke API<br>compatibility.<br><br>OS#3729<br>Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M configure.ac<br>2 files changed, 34 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index 270bd4a..b004308 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -41,6 +41,24 @@</span><br><span> #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */</span><br><span> #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int compat_LMS_VCTCXORead(lms_device_t *dev, uint16_t *val, bool memory)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+#if HAVE_LMS_VCTCXO_EEPROM_SAVING</span><br><span style="color: hsl(120, 100%, 40%);">+ return LMS_VCTCXORead(dev, val, memory);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ return LMS_VCTCXORead(dev, val);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</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%);">+static int compat_LMS_VCTCXOWrite(lms_device_t *dev, uint16_t val, bool memory)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+#if HAVE_LMS_VCTCXO_EEPROM_SAVING</span><br><span style="color: hsl(120, 100%, 40%);">+ return LMS_VCTCXOWrite(dev, val, memory);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ return LMS_VCTCXOWrite(dev, val);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,</span><br><span> const std::vector<std::string>& tx_paths,</span><br><span> const std::vector<std::string>& rx_paths):</span><br><span>@@ -195,10 +213,10 @@</span><br><span> case REF_INTERNAL:</span><br><span> LOGC(DDEV, INFO) << "Setting Internal clock reference";</span><br><span> /* Ugly API: Selecting clock source implicit by writing to VCTCXO DAC ?!? */</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_VCTCXORead(m_lms_dev, &dac_val) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (compat_LMS_VCTCXORead(m_lms_dev, &dac_val, false) < 0)</span><br><span> goto out_close;</span><br><span> LOGC(DDEV, INFO) << "Setting VCTCXO to " << dac_val;</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_VCTCXOWrite(m_lms_dev, dac_val) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (compat_LMS_VCTCXOWrite(m_lms_dev, dac_val, false) < 0)</span><br><span> goto out_close;</span><br><span> break;</span><br><span> case REF_EXTERNAL:</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 2e036ba..37b70fa 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -160,6 +160,20 @@</span><br><span> </span><br><span> AS_IF([test "x$with_lms" = "xyes"], [</span><br><span> PKG_CHECK_MODULES(LMS, LimeSuite)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # LimeSuite dc124e4e2ed9b549b142410af172f0592f9f0c23 > 18.10 broke API compatibility:</span><br><span style="color: hsl(120, 100%, 40%);">+ _cflags_save=$CFLAGS</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$CFLAGS $LMS_CFLAGS"</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_COMPILE_IFELSE(</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_LANG_PROGRAM(</span><br><span style="color: hsl(120, 100%, 40%);">+ [[#include <lime/LimeSuite.h>]],</span><br><span style="color: hsl(120, 100%, 40%);">+ [[LMS_VCTCXOWrite(NULL, 0, false); LMS_VCTCXORead(NULL, 0, false);]]</span><br><span style="color: hsl(120, 100%, 40%);">+ )],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_DEFINE([HAVE_LMS_VCTCXO_EEPROM_SAVING], [1],</span><br><span style="color: hsl(120, 100%, 40%);">+ [LMS_VCTCXO* requires memory parameter])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AC_DEFINE([HAVE_LMS_VCTCXO_EEPROM_SAVING], [0],</span><br><span style="color: hsl(120, 100%, 40%);">+ [LMS_VCTCXO* has no memory parameter])])</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS=$_cflags_save</span><br><span> ])</span><br><span> </span><br><span> AS_IF([test "x$with_uhd" != "xno"],[</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12303">change 12303</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/12303"/><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: Idf500a5b39a857233f728c6a4316c00a99374556 </div>
<div style="display:none"> Gerrit-Change-Number: 12303 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>