<p>Alexander Chemeris <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9997">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">coding: Correctly count bits when decoding EDGE bursts with MCS >= 7.<br><br>They consist of two blocks, so we should count both blocks.<br><br>Change-Id: I560de192212dae4705054a1665726369b83d213a<br>---<br>M src/coding/gsm0503_coding.c<br>1 file changed, 8 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c</span><br><span>index c72aabc..088b8bb 100644</span><br><span>--- a/src/coding/gsm0503_coding.c</span><br><span>+++ b/src/coding/gsm0503_coding.c</span><br><span>@@ -979,6 +979,9 @@</span><br><span>          if (rc < 0)</span><br><span>                       return -EFAULT;</span><br><span>      } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              /* Bit counters for the second block */</span><br><span style="color: hsl(120, 100%, 40%);">+               int n_errors2, n_bits_total2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>              /* MCS-7,8,9 block 1 */</span><br><span>              rc = egprs_decode_data(l2_data, c1, cps.mcs, cps.p[0],</span><br><span>                       0, n_errors, n_bits_total);</span><br><span>@@ -987,7 +990,11 @@</span><br><span> </span><br><span>               /* MCS-7,8,9 block 2 */</span><br><span>              rc = egprs_decode_data(l2_data, c2, cps.mcs, cps.p[1],</span><br><span style="color: hsl(0, 100%, 40%);">-                  1, n_errors, n_bits_total);</span><br><span style="color: hsl(120, 100%, 40%);">+                   1, &n_errors2, &n_bits_total2);</span><br><span style="color: hsl(120, 100%, 40%);">+               if (n_errors)</span><br><span style="color: hsl(120, 100%, 40%);">+                 *n_errors += n_errors2;</span><br><span style="color: hsl(120, 100%, 40%);">+               if (n_bits_total)</span><br><span style="color: hsl(120, 100%, 40%);">+                     *n_bits_total += n_bits_total2;</span><br><span>              if (rc < 0)</span><br><span>                       return -EFAULT;</span><br><span>      }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9997">change 9997</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/9997"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I560de192212dae4705054a1665726369b83d213a </div>
<div style="display:none"> Gerrit-Change-Number: 9997 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Alexander Chemeris <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Alexander Chemeris <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Ivan Kluchnikov <kluchnikovi@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>