<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17354">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: align Downlink reception to the first burst<br><br>It may happen that the burst reception would start from bid != 0:<br><br> <0005> sched_trx.c:263 (Re)configure TDMA timeslot #2 as TCH/H+SACCH<br> <0005> sched_trx.c:420 Activating lchan=TCH/H(0) on ts=2<br> <0005> sched_trx.c:420 Activating lchan=SACCH/TH(0) on ts=2<br> <0006> sched_lchan_xcch.c:96 Received incomplete data frame at fn=0 (0/104) for SACCH/TH(0)<br> <0006> sched_lchan_xcch.c:106 Received bad data frame at fn=0 (0/104) for SACCH/TH(0)<br><br>so in that case, both measurement processing and the frame number<br>calculation would yield incorrect and/or incomplete results. The<br>Rx burst mask can be used to eliminate this problem.<br><br>In particular, if we shift it left instead of cleaning, it would<br>never be equal 0x00 after at least one burst is received. This<br>would allow us to skip decoding of an incomplete frame at the<br>beginning when the logical channel was just activated.<br><br>Note that TCH/H handler is not affected because it already uses<br>the strategy described above, so we keep it unchanged.<br><br>Change-Id: Ib8ddf2edd5ef84f2ab12155f7a8874c9fc56d436<br>Related: OS#3554<br>---<br>M src/host/trxcon/sched_lchan_pdtch.c<br>M src/host/trxcon/sched_lchan_tchf.c<br>M src/host/trxcon/sched_lchan_xcch.c<br>3 files changed, 18 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>index d965daa..8de947e 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>@@ -58,9 +58,9 @@</span><br><span> LOGP(DSCHD, LOGL_DEBUG, "Packet data received on %s: "</span><br><span> "fn=%u ts=%u bid=%u\n", lchan_desc->name, fn, ts->index, bid);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Reset internal state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bid == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- *mask = 0x0;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Align to the first burst of a block */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*mask == 0x00 && bid != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span> /* Update mask */</span><br><span> *mask |= (1 << bid);</span><br><span>@@ -92,6 +92,9 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Keep the mask updated */</span><br><span style="color: hsl(120, 100%, 40%);">+ *mask = *mask << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Attempt to decode */</span><br><span> rc = gsm0503_pdtch_decode(l2, buffer,</span><br><span> NULL, &n_errors, &n_bits_total);</span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>index 198d25f..312425b 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchf.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>@@ -60,9 +60,9 @@</span><br><span> LOGP(DSCHD, LOGL_DEBUG, "Traffic received on %s: fn=%u ts=%u bid=%u\n",</span><br><span> lchan_desc->name, fn, ts->index, bid);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Reset internal state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bid == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- *mask = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Align to the first burst of a block */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*mask == 0x00 && bid != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span> /* Update mask */</span><br><span> *mask |= (1 << bid);</span><br><span>@@ -95,6 +95,9 @@</span><br><span> goto bfi;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Keep the mask updated */</span><br><span style="color: hsl(120, 100%, 40%);">+ *mask = *mask << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (lchan->tch_mode) {</span><br><span> case GSM48_CMODE_SIGN:</span><br><span> case GSM48_CMODE_SPEECH_V1: /* FR */</span><br><span>diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>index 0818e20..a0b61ad 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_xcch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>@@ -57,9 +57,9 @@</span><br><span> LOGP(DSCHD, LOGL_DEBUG, "Data received on %s: fn=%u ts=%u bid=%u\n",</span><br><span> lchan_desc->name, fn, ts->index, bid);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Reset internal state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bid == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- *mask = 0x0;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Align to the first burst of a block */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*mask == 0x00 && bid != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> </span><br><span> /* Update mask */</span><br><span> *mask |= (1 << bid);</span><br><span>@@ -93,6 +93,9 @@</span><br><span> * abort here. */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Keep the mask updated */</span><br><span style="color: hsl(120, 100%, 40%);">+ *mask = *mask << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Attempt to decode */</span><br><span> rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total);</span><br><span> if (rc) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17354">change 17354</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/osmocom-bb/+/17354"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib8ddf2edd5ef84f2ab12155f7a8874c9fc56d436 </div>
<div style="display:none"> Gerrit-Change-Number: 17354 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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>