<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/14656">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Transceiver: Move nbits burst size calculation to pullRadioVector()<br><br>That's where all the filling logic happens, while in driveReceiveFIFO we<br>mostly want to take the burst, generate a message and sent it over the<br>socket.<br><br>Related: OS#4006<br>Change-Id: Ib1df10c40d737954904290f57d58b1c77d65f82e<br>---<br>M Transceiver52M/Transceiver.cpp<br>M Transceiver52M/Transceiver.h<br>2 files changed, 11 insertions(+), 11 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/56/14656/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 f04a132..a0ff4cd 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -643,6 +643,12 @@</span><br><span> bi->toa = toa;</span><br><span> bi->rxBurst = demodAnyBurst(*burst, mSPSRx, amp, toa, type);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* EDGE demodulator returns 444 (gSlotLen * 3) bits */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi->rxBurst->size() == EDGE_BURST_NBITS)</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->nbits = EDGE_BURST_NBITS;</span><br><span style="color: hsl(120, 100%, 40%);">+ else /* size() here is actually gSlotLen + 8, due to guard periods */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->nbits = gSlotLen;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> delete radio_burst;</span><br><span> return true;</span><br><span> }</span><br><span>@@ -917,7 +923,6 @@</span><br><span> {</span><br><span> double dBm; // in dBm</span><br><span> int TOAint; // in 1/256 symbols</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned nbits = gSlotLen;</span><br><span> </span><br><span> struct trx_ul_burst_ind bi;</span><br><span> </span><br><span>@@ -927,18 +932,12 @@</span><br><span> // Convert -1..+1 soft bits to 0..1 soft bits</span><br><span> vectorSlicer(bi.rxBurst);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * EDGE demodulator returns 444 (148 * 3) bits</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bi.rxBurst->size() == gSlotLen * 3)</span><br><span style="color: hsl(0, 100%, 40%);">- nbits = gSlotLen * 3;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> dBm = bi.rssi + rssiOffset;</span><br><span> logRxBurst(chan, &bi, dBm);</span><br><span> </span><br><span> TOAint = (int) (bi.toa * 256.0 + 0.5); // round to closest integer</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- char burstString[sizeof(struct trxd_hdr_v0) + nbits + 2];</span><br><span style="color: hsl(120, 100%, 40%);">+ char burstString[sizeof(struct trxd_hdr_v0) + bi.nbits + 2];</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>@@ -948,14 +947,14 @@</span><br><span> osmo_store16be(TOAint, &pkt->v0.toa);</span><br><span> SoftVector::iterator burstItr = bi.rxBurst->begin();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (unsigned i = 0; i < nbits; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ for (unsigned i = 0; i < bi.nbits; i++)</span><br><span> pkt->soft_bits[i] = (char) round((*burstItr++) * 255.0);</span><br><span> </span><br><span> /* +1: Historical reason. There's an uninitizalied byte in there: pkt->soft_bits[bi.nbits] */</span><br><span style="color: hsl(0, 100%, 40%);">- pkt->soft_bits[nbits + 1] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+ pkt->soft_bits[bi.nbits + 1] = '\0';</span><br><span> delete bi.rxBurst;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mDataSockets[chan]->write(burstString, sizeof(struct trxd_hdr_v0) + nbits + 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ mDataSockets[chan]->write(burstString, sizeof(struct trxd_hdr_v0) + bi.nbits + 2);</span><br><span> }</span><br><span> </span><br><span> void Transceiver::driveTxFIFO()</span><br><span>diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h</span><br><span>index 965d07d..d7c6182 100644</span><br><span>--- a/Transceiver52M/Transceiver.h</span><br><span>+++ b/Transceiver52M/Transceiver.h</span><br><span>@@ -37,6 +37,7 @@</span><br><span> </span><br><span> struct trx_ul_burst_ind {</span><br><span> SoftVector *rxBurst;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned nbits; // number of symbols per slot in rxBurst, not counting guard periods</span><br><span> GSM::Time burstTime;</span><br><span> double rssi; // in dBFS</span><br><span> double toa; // in symbols</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/14656">change 14656</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/+/14656"/><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: Ib1df10c40d737954904290f57d58b1c77d65f82e </div>
<div style="display:none"> Gerrit-Change-Number: 14656 </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>