<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18035">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx/scheduler: fix measurement handling for SUB frames<br><br>Make sure that we pick the correct UL measurements from the<br>history when we deal with AMR SID frames (SUB frames).<br><br>Change-Id: I902bb47d68742d2589156f61099b67a0edbaf40b<br>Related: OS#2978<br>---<br>M include/osmo-bts/scheduler.h<br>M src/osmo-bts-trx/sched_lchan_tchf.c<br>M src/osmo-bts-trx/sched_lchan_tchh.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>4 files changed, 43 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h</span><br><span>index b488b6c..f19a13e 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -276,6 +276,12 @@</span><br><span> SCHED_MEAS_AVG_M_OCTO,</span><br><span> /* last 6 bursts (default for FACCH/H) */</span><br><span> SCHED_MEAS_AVG_M_SIX,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* first 4 of last 8 bursts */</span><br><span style="color: hsl(120, 100%, 40%);">+ SCHED_MEAS_AVG_M8_FIRST_QUAD,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* first 2 of last 6 bursts */</span><br><span style="color: hsl(120, 100%, 40%);">+ SCHED_MEAS_AVG_M6_FIRST_TWO,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* middle 2 of last 6 bursts */</span><br><span style="color: hsl(120, 100%, 40%);">+ SCHED_MEAS_AVG_M6_MIDDLE_TWO,</span><br><span> };</span><br><span> </span><br><span> void trx_sched_meas_push(struct l1sched_chan_state *chan_state,</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>index e29a47e..9c5bfc2 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>@@ -173,6 +173,17 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ switch (chan_state->amr_last_dtx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AFS_SID_FIRST:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AFS_SID_UPDATE_CN:</span><br><span style="color: hsl(120, 100%, 40%);">+ meas_avg_mode = SCHED_MEAS_AVG_M8_FIRST_QUAD;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case AFS_SID_UPDATE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AFS_ONSET:</span><br><span style="color: hsl(120, 100%, 40%);">+ meas_avg_mode = SCHED_MEAS_AVG_M_QUAD;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (rc)</span><br><span> trx_loop_amr_input(l1t,</span><br><span> trx_chan_desc[chan].chan_nr | bi->tn, chan_state,</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>index 2a561e1..c400542 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>@@ -184,6 +184,20 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ switch (chan_state->amr_last_dtx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AHS_SID_FIRST_P1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AHS_SID_FIRST_P2:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AHS_SID_UPDATE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AHS_SID_UPDATE_CN:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AHS_SID_FIRST_INH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AHS_SID_UPDATE_INH:</span><br><span style="color: hsl(120, 100%, 40%);">+ meas_avg_mode = SCHED_MEAS_AVG_M6_FIRST_TWO;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case AHS_ONSET:</span><br><span style="color: hsl(120, 100%, 40%);">+ meas_avg_mode = SCHED_MEAS_AVG_M6_MIDDLE_TWO;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (rc)</span><br><span> trx_loop_amr_input(l1t,</span><br><span> trx_chan_desc[chan].chan_nr | bi->tn, chan_state,</span><br><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index 3921280..c000324 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>@@ -517,6 +517,18 @@</span><br><span> case SCHED_MEAS_AVG_M_SIX:</span><br><span> n = 6; shift = n;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* first 4 of last 8 bursts */</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCHED_MEAS_AVG_M8_FIRST_QUAD:</span><br><span style="color: hsl(120, 100%, 40%);">+ n = 4; shift = 8;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* first 2 of last 6 bursts */</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCHED_MEAS_AVG_M6_FIRST_TWO:</span><br><span style="color: hsl(120, 100%, 40%);">+ n = 2; shift = 6;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* middle 2 of last 6 bursts */</span><br><span style="color: hsl(120, 100%, 40%);">+ case SCHED_MEAS_AVG_M6_MIDDLE_TWO:</span><br><span style="color: hsl(120, 100%, 40%);">+ n = 2; shift = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> /* Shall not happen */</span><br><span> OSMO_ASSERT(false);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18035">change 18035</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/+/18035"/><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: I902bb47d68742d2589156f61099b67a0edbaf40b </div>
<div style="display:none"> Gerrit-Change-Number: 18035 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>