<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12699">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  dexter: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler_trx: Fix erroneous multiply-by-four<br><br>Commit acefd0586e5d463b2e7a6a039131994bc12573fc introduced the "toa256"<br>resolution change.<br><br>Before the change, _sched_compose_ph_data_ind() used quarter-bits as<br>units, so multiplying the old "toa" value by four made sense.<br><br>However, after said change, the value is in 1/256th of bits, and hence<br>we need to report the toa256 value without any multiply-by-four.<br><br>Change-Id: I9f980236ea1cd635cb229290e187747cc8c86d8d<br>Related: OS#2977<br>---<br>M src/osmo-bts-trx/scheduler_trx.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index fa3aed2..1b0ba73 100644</span><br><span>--- a/src/osmo-bts-trx/scheduler_trx.c</span><br><span>+++ b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>@@ -846,7 +846,7 @@</span><br><span>  ber10k = compute_ber10k(n_bits_total, n_errors);</span><br><span>     return _sched_compose_ph_data_ind(l1t, tn, *first_fn, chan, l2, l2_len,</span><br><span>                                        *rssi_sum / *rssi_num,</span><br><span style="color: hsl(0, 100%, 40%);">-                                          4 * (*toa256_sum) / *toa_num, 0, ber10k,</span><br><span style="color: hsl(120, 100%, 40%);">+                                      *toa256_sum / *toa_num, 0, ber10k,</span><br><span>                                           PRES_INFO_UNKNOWN);</span><br><span> }</span><br><span> </span><br><span>@@ -947,7 +947,7 @@</span><br><span>         }</span><br><span>    ber10k = compute_ber10k(n_bits_total, n_errors);</span><br><span>     return _sched_compose_ph_data_ind(l1t, tn, (fn + GSM_HYPERFRAME - 3) % GSM_HYPERFRAME, chan,</span><br><span style="color: hsl(0, 100%, 40%);">-            l2, rc, *rssi_sum / *rssi_num, 4 * (*toa256_sum) / *toa_num, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+               l2, rc, *rssi_sum / *rssi_num, *toa256_sum / *toa_num, 0,</span><br><span>                                      ber10k, PRES_INFO_BOTH);</span><br><span> }</span><br><span> </span><br><span>@@ -1071,7 +1071,7 @@</span><br><span>  if (rc == GSM_MACBLOCK_LEN) {</span><br><span>                uint16_t ber10k = compute_ber10k(n_bits_total, n_errors);</span><br><span>            _sched_compose_ph_data_ind(l1t, tn, (fn + GSM_HYPERFRAME - 7) % GSM_HYPERFRAME, chan,</span><br><span style="color: hsl(0, 100%, 40%);">-                   tch_data + amr, GSM_MACBLOCK_LEN, rssi, 4 * toa256, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+                        tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256, 0,</span><br><span>                                      ber10k, PRES_INFO_UNKNOWN);</span><br><span> bfi:</span><br><span>               if (rsl_cmode == RSL_CMOD_SPD_SPEECH) {</span><br><span>@@ -1263,7 +1263,7 @@</span><br><span>              uint16_t ber10k = compute_ber10k(n_bits_total, n_errors);</span><br><span>            _sched_compose_ph_data_ind(l1t, tn,</span><br><span>                  (fn + GSM_HYPERFRAME - 10 - ((fn % 26) >= 19)) % GSM_HYPERFRAME, chan,</span><br><span style="color: hsl(0, 100%, 40%);">-                       tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256/64, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+                 tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256, 0,</span><br><span>                                      ber10k, PRES_INFO_UNKNOWN);</span><br><span> bfi:</span><br><span>               if (rsl_cmode == RSL_CMOD_SPD_SPEECH) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12699">change 12699</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/12699"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9f980236ea1cd635cb229290e187747cc8c86d8d </div>
<div style="display:none"> Gerrit-Change-Number: 12699 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>