<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9621">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;">radioDevice: Move tx_sps from derived into base class<br><br>All three derived classes use a tx_sps member, let's move this into<br>the base class.<br><br>Change-Id: I73b4aa2705c5049561e2d7b21301a0d2b3c96ced<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<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.cpp<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>6 files changed, 18 insertions(+), 17 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 518e581..68d4b97 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -40,13 +40,14 @@</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(0, 100%, 40%);">-LMSDevice::LMSDevice(size_t sps, size_t chans,</span><br><span style="color: hsl(120, 100%, 40%);">+LMSDevice::LMSDevice(size_t tx_sps, size_t chans,</span><br><span> const std::vector<std::string>& tx_paths,</span><br><span> const std::vector<std::string>& rx_paths):</span><br><span style="color: hsl(0, 100%, 40%);">- m_lms_dev(NULL), sps(sps), chans(chans)</span><br><span style="color: hsl(120, 100%, 40%);">+ m_lms_dev(NULL), chans(chans)</span><br><span> {</span><br><span> LOG(INFO) << "creating LMS device...";</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ this->tx_sps = tx_sps;</span><br><span> this->tx_paths = tx_paths;</span><br><span> this->rx_paths = rx_paths;</span><br><span> </span><br><span>@@ -135,8 +136,8 @@</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%);">- LOG(DEBUG) << "Setting sample rate to " << GSMRATE*sps << " " << sps;</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_SetSampleRate(m_lms_dev, GSMRATE*sps, 32) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG(DEBUG) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 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>@@ -144,7 +145,7 @@</span><br><span> LOG(DEBUG) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf;</span><br><span> </span><br><span> /* 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 * sps); /* time * sample_rate */</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_offset = static_cast<TIMESTAMP>(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */</span><br><span> </span><br><span> switch (ref) {</span><br><span> case REF_INTERNAL:</span><br><span>@@ -362,7 +363,7 @@</span><br><span> bool LMSDevice::flush_recv(size_t num_pkts)</span><br><span> {</span><br><span> #define CHUNK 625</span><br><span style="color: hsl(0, 100%, 40%);">- int len = CHUNK * sps;</span><br><span style="color: hsl(120, 100%, 40%);">+ int len = CHUNK * tx_sps;</span><br><span> short *buffer = new short[len * 2];</span><br><span> int rc;</span><br><span> lms_stream_meta_t rx_metadata = {};</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index ef6d2b4..0fe4c15 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -46,7 +46,7 @@</span><br><span> std::vector<uint32_t> m_last_tx_underruns;</span><br><span> std::vector<uint32_t> m_last_tx_overruns;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- size_t sps, chans;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t chans;</span><br><span> double actualSampleRate; ///< the actual USRP sampling rate</span><br><span> </span><br><span> unsigned long long samplesRead; ///< number of samples read from LMS</span><br><span>@@ -65,7 +65,7 @@</span><br><span> public:</span><br><span> </span><br><span> /** Object constructor */</span><br><span style="color: hsl(0, 100%, 40%);">- LMSDevice(size_t sps, size_t chans,</span><br><span style="color: hsl(120, 100%, 40%);">+ LMSDevice(size_t tx_sps, size_t chans,</span><br><span> const std::vector<std::string>& tx_paths,</span><br><span> const std::vector<std::string>& rx_paths);</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/radioDevice.h b/Transceiver52M/device/radioDevice.h</span><br><span>index 469b574..a9328ec 100644</span><br><span>--- a/Transceiver52M/device/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/radioDevice.h</span><br><span>@@ -165,6 +165,7 @@</span><br><span> virtual double numberWritten()=0;</span><br><span> </span><br><span> std::vector<std::string> tx_paths, rx_paths;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t tx_sps;</span><br><span> bool set_antennas() {</span><br><span> unsigned int i;</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 77a3446..ddcad3a 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -282,7 +282,7 @@</span><br><span> enum TxWindowType tx_window;</span><br><span> enum uhd_dev_type dev_type;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- size_t tx_sps, rx_sps, chans;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t rx_sps, chans;</span><br><span> double tx_rate, rx_rate;</span><br><span> </span><br><span> double tx_gain_min, tx_gain_max;</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>index 7f73f43..07ba1c9 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp</span><br><span>@@ -58,12 +58,12 @@</span><br><span> </span><br><span> const double USRPDevice::masterClockRate = 52.0e6;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-USRPDevice::USRPDevice(size_t sps)</span><br><span style="color: hsl(120, 100%, 40%);">+USRPDevice::USRPDevice(size_t tx_sps)</span><br><span> {</span><br><span> LOG(INFO) << "creating USRP device...";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- this->sps = sps;</span><br><span style="color: hsl(0, 100%, 40%);">- decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) sps));</span><br><span style="color: hsl(120, 100%, 40%);">+ this->tx_sps = tx_sps;</span><br><span style="color: hsl(120, 100%, 40%);">+ decimRate = (unsigned int) round(masterClockRate/((GSMRATE) * (double) tx_sps));</span><br><span> actualSampleRate = masterClockRate/decimRate;</span><br><span> rxGain = 0;</span><br><span> </span><br><span>@@ -73,9 +73,9 @@</span><br><span> * split sample rate Tx/Rx - 4/1 sps we need to need to</span><br><span> * compensate for advance rather than delay.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (sps == 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tx_sps == 1)</span><br><span> pingOffset = 272;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (sps == 4)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (tx_sps == 4)</span><br><span> pingOffset = 269 - 7500;</span><br><span> else</span><br><span> pingOffset = 0;</span><br><span>@@ -100,7 +100,7 @@</span><br><span> if (!skipRx) {</span><br><span> try {</span><br><span> m_uRx = usrp_standard_rx_sptr(usrp_standard_rx::make(</span><br><span style="color: hsl(0, 100%, 40%);">- 0, decimRate * sps, 1, -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, decimRate * tx_sps, 1, -1,</span><br><span> usrp_standard_rx::FPGA_MODE_NORMAL,</span><br><span> 1024, 16 * 8, rbf));</span><br><span> m_uRx->set_fpga_master_clock_freq(masterClockRate);</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index efdedb3..ff5b273 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -48,7 +48,6 @@</span><br><span> usrp_subdev_spec rxSubdevSpec;</span><br><span> usrp_subdev_spec txSubdevSpec;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int sps;</span><br><span> double actualSampleRate; ///< the actual USRP sampling rate</span><br><span> unsigned int decimRate; ///< the USRP decimation rate</span><br><span> </span><br><span>@@ -96,7 +95,7 @@</span><br><span> public:</span><br><span> </span><br><span> /** Object constructor */</span><br><span style="color: hsl(0, 100%, 40%);">- USRPDevice(size_t sps);</span><br><span style="color: hsl(120, 100%, 40%);">+ USRPDevice(size_t tx_sps);</span><br><span> </span><br><span> /** Instantiate the USRP */</span><br><span> int open(const std::string &, int, bool);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9621">change 9621</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/9621"/><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: I73b4aa2705c5049561e2d7b21301a0d2b3c96ced </div>
<div style="display:none"> Gerrit-Change-Number: 9621 </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>