<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/15757">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: 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: use gsm0502_fn_remap() to calculate frame number<br><br>When sched_compose_tch_ind, sched_compose_ph_data_ind or l1if_process_meas_res<br>is called from rx_tchf_fn or rx_tchh_fn the frame number of the beginning of<br>the block is required. At the moment this frame number is calculated<br>wrongly using strange formulas. Lets use gsm0502_fn_remap() to calculate<br>the beginning of the block properly<br><br>Change-Id: I37601ddd85e4287dd9e41ad4a8cb7d314de1a83d<br>Depends: libosmocore I3d71c66f8c401f5afbad9b1c86c24580dab9e0ce<br>Related: OS#3803<br>---<br>M src/osmo-bts-trx/scheduler_trx.c<br>1 file changed, 35 insertions(+), 26 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 d63987b..88e4f3a 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>@@ -46,6 +46,7 @@</span><br><span> #include <osmo-bts/msg_utils.h></span><br><span> #include <osmo-bts/scheduler.h></span><br><span> #include <osmo-bts/scheduler_backend.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm0502.h></span><br><span> </span><br><span> #include "l1_if.h"</span><br><span> #include "trx_if.h"</span><br><span>@@ -1142,6 +1143,7 @@</span><br><span> bool bfi_flag = false;</span><br><span> struct gsm_lchan *lchan =</span><br><span> get_lchan_by_chan_nr(l1t->trx, trx_chan_desc[chan].chan_nr | bi->tn);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int fn_begin;</span><br><span> </span><br><span> /* handle rach, if handover rach detection is turned on */</span><br><span> if (chan_state->ho_rach_detect == 1)</span><br><span>@@ -1225,12 +1227,6 @@</span><br><span> }</span><br><span> memcpy(*bursts_p, *bursts_p + 464, 464);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send uplink measurement information to L2 */</span><br><span style="color: hsl(0, 100%, 40%);">- l1if_process_meas_res(l1t->trx, bi->tn, *first_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- trx_chan_desc[chan].chan_nr | bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- n_errors, n_bits_total,</span><br><span style="color: hsl(0, 100%, 40%);">- bi->rssi, bi->toa256);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Check if the frame is bad */</span><br><span> if (rc < 0) {</span><br><span> LOGL1S(DL1P, LOGL_NOTICE, l1t, bi->tn, chan, bi->fn,</span><br><span>@@ -1253,9 +1249,12 @@</span><br><span> /* FACCH */</span><br><span> if (rc == GSM_MACBLOCK_LEN) {</span><br><span> uint16_t ber10k = compute_ber10k(n_bits_total, n_errors);</span><br><span style="color: hsl(0, 100%, 40%);">- _sched_compose_ph_data_ind(l1t, bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: this calculation is wrong */</span><br><span style="color: hsl(0, 100%, 40%);">- (bi->fn + GSM_HYPERFRAME - 7) % GSM_HYPERFRAME, chan,</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_process_meas_res(l1t->trx, bi->tn, fn_begin,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_chan_desc[chan].chan_nr | bi->tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ n_errors, n_bits_total,</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->rssi, bi->toa256);</span><br><span style="color: hsl(120, 100%, 40%);">+ _sched_compose_ph_data_ind(l1t, bi->tn, fn_begin, chan,</span><br><span> tch_data + amr, GSM_MACBLOCK_LEN,</span><br><span> /* FIXME: AVG RSSI and ToA256 */</span><br><span> bi->rssi, bi->toa256,</span><br><span>@@ -1314,10 +1313,13 @@</span><br><span> </span><br><span> /* TCH or BFI */</span><br><span> compose_l1sap:</span><br><span style="color: hsl(0, 100%, 40%);">- return _sched_compose_tch_ind(l1t, bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: this calculation is wrong */</span><br><span style="color: hsl(0, 100%, 40%);">- (bi->fn + GSM_HYPERFRAME - 7) % GSM_HYPERFRAME, chan,</span><br><span style="color: hsl(0, 100%, 40%);">- tch_data, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_F);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_process_meas_res(l1t->trx, bi->tn, fn_begin,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_chan_desc[chan].chan_nr | bi->tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ n_errors, n_bits_total,</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->rssi, bi->toa256);</span><br><span style="color: hsl(120, 100%, 40%);">+ return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan,</span><br><span style="color: hsl(120, 100%, 40%);">+ tch_data, rc);</span><br><span> }</span><br><span> </span><br><span> /*! \brief a single TCH/H burst was received by the PHY, process it */</span><br><span>@@ -1342,6 +1344,7 @@</span><br><span> * Even FN ending at: 10,11,19,20,2,3</span><br><span> */</span><br><span> int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int fn_begin;</span><br><span> </span><br><span> /* handle RACH, if handover RACH detection is turned on */</span><br><span> if (chan_state->ho_rach_detect == 1)</span><br><span>@@ -1436,12 +1439,6 @@</span><br><span> memcpy(*bursts_p, *bursts_p + 232, 232);</span><br><span> memcpy(*bursts_p + 232, *bursts_p + 464, 232);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send uplink measurement information to L2 */</span><br><span style="color: hsl(0, 100%, 40%);">- l1if_process_meas_res(l1t->trx, bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- *first_fn /* FIXME: this is wrong */,</span><br><span style="color: hsl(0, 100%, 40%);">- trx_chan_desc[chan].chan_nr | bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- n_errors, n_bits_total, bi->rssi, bi->toa256);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Check if the frame is bad */</span><br><span> if (rc < 0) {</span><br><span> LOGL1S(DL1P, LOGL_NOTICE, l1t, bi->tn, chan, bi->fn,</span><br><span>@@ -1465,9 +1462,15 @@</span><br><span> if (rc == GSM_MACBLOCK_LEN) {</span><br><span> chan_state->ul_ongoing_facch = 1;</span><br><span> uint16_t ber10k = compute_ber10k(n_bits_total, n_errors);</span><br><span style="color: hsl(0, 100%, 40%);">- _sched_compose_ph_data_ind(l1t, bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: what the hell is this?!? */</span><br><span style="color: hsl(0, 100%, 40%);">- (bi->fn + GSM_HYPERFRAME - 10 - ((bi->fn % 26) >= 19)) % GSM_HYPERFRAME, chan,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->nr == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H0);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H1);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_process_meas_res(l1t->trx, bi->tn, fn_begin,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_chan_desc[chan].chan_nr | bi->tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ n_errors, n_bits_total, bi->rssi,</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->toa256);</span><br><span style="color: hsl(120, 100%, 40%);">+ _sched_compose_ph_data_ind(l1t, bi->tn, fn_begin, chan,</span><br><span> tch_data + amr, GSM_MACBLOCK_LEN,</span><br><span> /* FIXME: AVG both RSSI and ToA */</span><br><span> bi->rssi, bi->toa256,</span><br><span>@@ -1528,10 +1531,16 @@</span><br><span> * with the slot 12, so an extra FN must be subtracted to get correct</span><br><span> * start of frame.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- return _sched_compose_tch_ind(l1t, bi->tn,</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: what the hell is this?!? */</span><br><span style="color: hsl(0, 100%, 40%);">- (bi->fn + GSM_HYPERFRAME - 10 - ((bi->fn%26)==19) - ((bi->fn%26)==20)) % GSM_HYPERFRAME,</span><br><span style="color: hsl(0, 100%, 40%);">- chan, tch_data, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->nr == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H0);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H1);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_process_meas_res(l1t->trx, bi->tn, fn_begin,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_chan_desc[chan].chan_nr | bi->tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ n_errors, n_bits_total, bi->rssi,</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->toa256);</span><br><span style="color: hsl(120, 100%, 40%);">+ return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan,</span><br><span style="color: hsl(120, 100%, 40%);">+ tch_data, rc);</span><br><span> }</span><br><span> </span><br><span> /* schedule all frames of all TRX for given FN */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/15757">change 15757</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-bts/+/15757"/><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-Change-Id: I37601ddd85e4287dd9e41ad4a8cb7d314de1a83d </div>
<div style="display:none"> Gerrit-Change-Number: 15757 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>