<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20853">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">measurement: fix expected number of measurements<br><br>The logic in measurement.c checks the amount of collected measurement<br>values. This is done for the total amount of measurements and the amount<br>of SUB blocks measurements.<br><br>The functions that return the expected number of measurement values<br>currently do not take into account that the mode of a TCH/F or TCH/H has<br>an effect on the number of expected SUB blocks. (In signalling channels<br>all blocks count as SUB). Also a TCH/H in signalling mode generates only<br>half the amount of measurements because the blocks in signalling mode<br>are sepreded over 6 bursts instead of 4. This also needs to be taken<br>into account.<br><br>Change-Id: I01c7b6cc908c647263ab88f6b6281c4732f88779<br>Related: OS#4799<br>---<br>M src/common/measurement.c<br>M tests/meas/meas_test.c<br>2 files changed, 25 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 1805553..d5c3ee0 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -397,11 +397,16 @@</span><br><span> </span><br><span> switch (pchan) {</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- /* 24 for TCH + 1 for SACCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 24 blocks for TCH + 1 for SACCH */</span><br><span> return 25;</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- /* 24 half-blocks for TCH + 1 for SACCH */</span><br><span style="color: hsl(0, 100%, 40%);">- return 25;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->tch_mode == GSM48_CMODE_SIGN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 12 blocks for TCH + 1 for SACCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 13;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 24 blocks for TCH + 1 for SACCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 25;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span> /* 2 for SDCCH + 1 for SACCH */</span><br><span>@@ -428,11 +433,21 @@</span><br><span> </span><br><span> switch (pchan) {</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- /* 1 block SDCCH, 2 blocks TCH */</span><br><span style="color: hsl(0, 100%, 40%);">- return 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->tch_mode == GSM48_CMODE_SIGN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1 block SACCH, 24 blocks TCH (see note 1) */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 25;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1 block SACCH, 2 blocks TCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- /* 1 block SDCCH, 4 half-blocks TCH */</span><br><span style="color: hsl(0, 100%, 40%);">- return 5;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->tch_mode == GSM48_CMODE_SIGN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1 block SACCH, 12 blocks TCH (see ynote 1) */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 13;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1 block SACCH, 4 blocks TCH */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 5;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span> /* no DTX here, all blocks must be present! */</span><br><span>@@ -444,6 +459,8 @@</span><br><span> default:</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Note 1: In signalling mode all blocks count as SUB blocks. */</span><br><span> }</span><br><span> </span><br><span> /* if we clip the TOA value to 12 bits, i.e. toa256=3200,</span><br><span>diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c</span><br><span>index 309a522..174abbe 100644</span><br><span>--- a/tests/meas/meas_test.c</span><br><span>+++ b/tests/meas/meas_test.c</span><br><span>@@ -84,6 +84,7 @@</span><br><span> </span><br><span> lchan = &trx->ts[mtc->ts].lchan[0];</span><br><span> lchan->ts->pchan = mtc->pchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tch_mode = GSM48_CMODE_SPEECH_V1;</span><br><span> reset_lchan_meas(lchan);</span><br><span> </span><br><span> /* feed uplink measurements into the code */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20853">change 20853</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/+/20853"/><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: I01c7b6cc908c647263ab88f6b6281c4732f88779 </div>
<div style="display:none"> Gerrit-Change-Number: 20853 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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-MessageType: merged </div>