<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/14642">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Transceiver: Drop use of GSM::Time from trx_ul_burst_ind<br><br>Use of that class is really not needed since we don't need to do any<br>calculation with those values, so we can simply store the final values<br>in the struct.<br><br>Related: OS#4006<br>Change-Id: Iadf2683d7f52138a2248598641f3b702252f325d<br>---<br>M Transceiver52M/Transceiver.cpp<br>M Transceiver52M/Transceiver.h<br>2 files changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/14642/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp</span><br><span>index a6a32f0..6e678ac 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -558,6 +558,7 @@</span><br><span> float toa, max = -1.0, avg = 0.0;</span><br><span> int max_i = -1;</span><br><span> signalVector *burst;</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM::Time burstTime;</span><br><span> TransceiverState *state = &mStates[chan];</span><br><span> </span><br><span> /* Blocking FIFO read */</span><br><span>@@ -566,8 +567,10 @@</span><br><span> return false;</span><br><span> </span><br><span> /* Set time and determine correlation type */</span><br><span style="color: hsl(0, 100%, 40%);">- bi->burstTime = radio_burst->getTime();</span><br><span style="color: hsl(0, 100%, 40%);">- CorrType type = expectedCorrType(bi->burstTime, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ burstTime = radio_burst->getTime();</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->fn = burstTime.FN();</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->tn = burstTime.TN();</span><br><span style="color: hsl(120, 100%, 40%);">+ CorrType type = expectedCorrType(burstTime, chan);</span><br><span> </span><br><span> /* Enable 8-PSK burst detection if EDGE is enabled */</span><br><span> if (mEdge && (type == TSC))</span><br><span>@@ -576,7 +579,7 @@</span><br><span> /* Debug: dump bursts to disk */</span><br><span> /* bits 0-7 - chan 0 timeslots</span><br><span> * bits 8-15 - chan 1 timeslots */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mWriteBurstToDiskMask & ((1<<bi->burstTime.TN()) << (8*chan)))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mWriteBurstToDiskMask & ((1<<bi->tn) << (8*chan)))</span><br><span> writeToFile(radio_burst, chan);</span><br><span> </span><br><span> /* No processing if the timeslot is off.</span><br><span>@@ -913,7 +916,7 @@</span><br><span> {</span><br><span> LOG(DEBUG) << std::fixed << std::right</span><br><span> << " chan: " << chan</span><br><span style="color: hsl(0, 100%, 40%);">- << " time: " << bi->burstTime</span><br><span style="color: hsl(120, 100%, 40%);">+ << " time: " << bi->tn << ":" << bi->fn</span><br><span> << " RSSI: " << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset)</span><br><span> << "dBFS/" << std::setw(6) << -bi->rssi << "dBm"</span><br><span> << " noise: " << std::setw(5) << std::setprecision(1) << (bi->noise - rssiOffset)</span><br><span>@@ -939,8 +942,8 @@</span><br><span> struct trxd_hdr_v0* pkt = (struct trxd_hdr_v0*)burstString;</span><br><span> pkt->common.version = 0;</span><br><span> pkt->common.reserved = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- pkt->common.tn = bi.burstTime.TN();</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store32be(bi.burstTime.FN(), &pkt->common.fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ pkt->common.tn = bi.tn;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store32be(bi.fn, &pkt->common.fn);</span><br><span> pkt->v0.rssi = bi.rssi;</span><br><span> osmo_store16be(TOAint, &pkt->v0.toa);</span><br><span> SoftVector::iterator burstItr = bi.rxBurst->begin();</span><br><span>diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h</span><br><span>index 7963519..9975823 100644</span><br><span>--- a/Transceiver52M/Transceiver.h</span><br><span>+++ b/Transceiver52M/Transceiver.h</span><br><span>@@ -38,7 +38,8 @@</span><br><span> struct trx_ul_burst_ind {</span><br><span> SoftVector *rxBurst;</span><br><span> unsigned nbits; // number of symbols per slot in rxBurst, not counting guard periods</span><br><span style="color: hsl(0, 100%, 40%);">- GSM::Time burstTime;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn; // TDMA frame number</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tn; // TDMA time-slot number</span><br><span> double rssi; // in dBFS</span><br><span> double toa; // in symbols</span><br><span> double noise; // noise level in dBFS</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/14642">change 14642</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/+/14642"/><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: Iadf2683d7f52138a2248598641f3b702252f325d </div>
<div style="display:none"> Gerrit-Change-Number: 14642 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>