<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/16877">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Make ts_offset and smpl rate coefs device-specific<br><br>Right now the values are the same for all devices, but they will differ<br>in forthcoming commits once multi-arfcn support is added.<br><br>Change-Id: I262d3a71848fc3070473e29e42820848e7591d02<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>1 file changed, 12 insertions(+), 8 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 1ef7728..5a5fbe4 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -67,15 +67,19 @@</span><br><span> bool clock_src_int_usable;</span><br><span> /* Device specific maximum tx levels selected by phasenoise measurements, in dB */</span><br><span> double max_tx_gain;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Sample rate coef (without having TX/RX samples per symbol into account) */</span><br><span style="color: hsl(120, 100%, 40%);">+ double rate;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Coefficient multiplied by TX sample rate in order to shift Tx time */</span><br><span style="color: hsl(120, 100%, 40%);">+ double ts_offset_coef;</span><br><span> /* Device Name Prefix as presented by LimeSuite API LMS_GetDeviceInfo() */</span><br><span> std::string name_prefix;</span><br><span> };</span><br><span> </span><br><span> static const std::map<enum lms_dev_type, struct dev_desc> dev_param_map {</span><br><span style="color: hsl(0, 100%, 40%);">- { LMS_DEV_SDR_USB, { true, true, 73.0, LMS_DEV_SDR_USB_PREFIX_NAME } },</span><br><span style="color: hsl(0, 100%, 40%);">- { LMS_DEV_SDR_MINI, { false, true, 66.0, LMS_DEV_SDR_MINI_PREFIX_NAME } },</span><br><span style="color: hsl(0, 100%, 40%);">- { LMS_DEV_NET_MICRO, { true, false, 71.0, LMS_DEV_NET_MICRO_PREFIX_NAME } },</span><br><span style="color: hsl(0, 100%, 40%);">- { LMS_DEV_UNKNOWN, { true, true, 73.0, "UNKNOWN" } },</span><br><span style="color: hsl(120, 100%, 40%);">+ { LMS_DEV_SDR_USB, { true, true, 73.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_USB_PREFIX_NAME } },</span><br><span style="color: hsl(120, 100%, 40%);">+ { LMS_DEV_SDR_MINI, { false, true, 66.0, GSMRATE, 8.9e-5, LMS_DEV_SDR_MINI_PREFIX_NAME } },</span><br><span style="color: hsl(120, 100%, 40%);">+ { LMS_DEV_NET_MICRO, { true, false, 71.0, GSMRATE, 8.9e-5, LMS_DEV_NET_MICRO_PREFIX_NAME } },</span><br><span style="color: hsl(120, 100%, 40%);">+ { LMS_DEV_UNKNOWN, { true, true, 73.0, GSMRATE, 8.9e-5, "UNKNOWN" } },</span><br><span> };</span><br><span> </span><br><span> static enum lms_dev_type parse_dev_type(lms_device_t *m_lms_dev)</span><br><span>@@ -277,16 +281,16 @@</span><br><span> goto out_close;</span><br><span> print_range("Sample Rate", &range_sr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, INFO) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps;</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 32) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ sr_host = dev_desc.rate * tx_sps;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(DDEV, INFO) << "Setting sample rate to " << sr_host << " " << tx_sps;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_SetSampleRate(m_lms_dev, sr_host, 32) < 0)</span><br><span> goto out_close;</span><br><span> </span><br><span> if (LMS_GetSampleRate(m_lms_dev, LMS_CH_RX, 0, &sr_host, &sr_rf))</span><br><span> goto out_close;</span><br><span> LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */</span><br><span style="color: hsl(0, 100%, 40%);">- ts_offset = static_cast<TIMESTAMP>(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_offset = static_cast<TIMESTAMP>(dev_desc.ts_offset_coef * sr_host);</span><br><span> </span><br><span> /* configure antennas */</span><br><span> if (!set_antennas()) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/16877">change 16877</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/c/osmo-trx/+/16877"/><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-Change-Id: I262d3a71848fc3070473e29e42820848e7591d02 </div>
<div style="display:none"> Gerrit-Change-Number: 16877 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>