<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17354">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: align Downlink reception to the first burst<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;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/17354/1</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 d190a16..06458f7 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: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>