<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26133">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_data: use ascending order for interference boundaries<br><br>It's more logical to have the boundaries sorted in ascending order:<br><br> * band 1 represents lowest interference levels,<br> * band 5 represents highest interference levels.<br><br>Change-Id: Ie9bf4bf0c89418685b8ea5096332d22cfba7c521<br>Related: SYS#5313<br>---<br>M doc/manuals/chapters/interf_meas.adoc<br>M src/osmo-bsc/gsm_data.c<br>M tests/nanobts_omlattr/nanobts_omlattr_test.c<br>M tests/nanobts_omlattr/nanobts_omlattr_test.ok<br>4 files changed, 16 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/interf_meas.adoc b/doc/manuals/chapters/interf_meas.adoc</span><br><span>index 62b08c4..c82ff49 100644</span><br><span>--- a/doc/manuals/chapters/interf_meas.adoc</span><br><span>+++ b/doc/manuals/chapters/interf_meas.adoc</span><br><span>@@ -19,7 +19,7 @@</span><br><span> network</span><br><span> bts 0</span><br><span> interference-meas avg-period 6 <1></span><br><span style="color: hsl(0, 100%, 40%);">- interference-meas level-bounds -85 <2> -91 -97 -103 -109 -115 <3></span><br><span style="color: hsl(120, 100%, 40%);">+ interference-meas level-bounds -115 <2> -109 -103 -97 -91 -85 <3></span><br><span> ----</span><br><span> <1> Averaging period (`Intave`) in SACCH multiframe periods (480ms).</span><br><span> <2> Interference level boundary `0` (in dBm).</span><br><span>@@ -34,11 +34,11 @@</span><br><span> averaged interference levels (initially in dBm) into these 5 bands.</span><br><span> </span><br><span> ----</span><br><span style="color: hsl(0, 100%, 40%);">--85 dBm -91 dBm -97 dBm -103 dBm -109 dBm -115 dBm</span><br><span style="color: hsl(0, 100%, 40%);">- | <1> | <2> | <3> | <4> | <5> | <6></span><br><span style="color: hsl(0, 100%, 40%);">- +----------+----------+----------+----------+----------+</span><br><span style="color: hsl(0, 100%, 40%);">- | band 1 | band 2 | band 3 | band 4 | band 5 |</span><br><span style="color: hsl(0, 100%, 40%);">- +----------+----------+----------+----------+----------+</span><br><span style="color: hsl(120, 100%, 40%);">+-115 dBm -109 dBm -103 dBm -97 dBm -91 dBm -85 dBm</span><br><span style="color: hsl(120, 100%, 40%);">+ | <1> | <2> | <3> | <4> | <5> | <6></span><br><span style="color: hsl(120, 100%, 40%);">+ +----------+----------+----------+----------+----------+</span><br><span style="color: hsl(120, 100%, 40%);">+ | band 1 | band 2 | band 3 | band 4 | band 5 |</span><br><span style="color: hsl(120, 100%, 40%);">+ +----------+----------+----------+----------+----------+</span><br><span> ----</span><br><span> <1> Interference level boundary `0` (outer).</span><br><span> <2> Interference level boundary `X1`.</span><br><span>@@ -49,7 +49,7 @@</span><br><span> </span><br><span> Unfortunately, it's not clearly defined by 3GPP how the BTS is supposed to map</span><br><span> dBm values outside of the outer boundaries (`0` and `X5`) to band values. The</span><br><span style="color: hsl(0, 100%, 40%);">-ip.access nanoBTS, for example, would map values -75 dBm and -120 dBm to bands</span><br><span style="color: hsl(120, 100%, 40%);">+ip.access nanoBTS, for example, would map values -120 dBm and -75 dBm to bands</span><br><span> 1 and 5, respectively. osmo-bts replicates this behavior.</span><br><span> </span><br><span> === PDCH and dynamic timeslot handling</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 0134e34..988d70e 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1120,12 +1120,12 @@</span><br><span> const struct gsm_interf_meas_params interf_meas_params_def = {</span><br><span> .avg_period = 6, /* 6 SACCH periods */</span><br><span> .bounds_dbm = {</span><br><span style="color: hsl(0, 100%, 40%);">- 85, /* 0: -85 dBm */</span><br><span style="color: hsl(0, 100%, 40%);">- 91, /* X1: -91 dBm */</span><br><span style="color: hsl(0, 100%, 40%);">- 97, /* X2: -97 dBm */</span><br><span style="color: hsl(0, 100%, 40%);">- 103, /* X3: -103 dBm */</span><br><span style="color: hsl(0, 100%, 40%);">- 109, /* X4: -109 dBm */</span><br><span style="color: hsl(0, 100%, 40%);">- 115, /* X5: -115 dBm */</span><br><span style="color: hsl(120, 100%, 40%);">+ 115, /* 0: -115 dBm */</span><br><span style="color: hsl(120, 100%, 40%);">+ 109, /* X1: -109 dBm */</span><br><span style="color: hsl(120, 100%, 40%);">+ 103, /* X2: -103 dBm */</span><br><span style="color: hsl(120, 100%, 40%);">+ 97, /* X3: -97 dBm */</span><br><span style="color: hsl(120, 100%, 40%);">+ 91, /* X4: -91 dBm */</span><br><span style="color: hsl(120, 100%, 40%);">+ 85, /* X5: -85 dBm */</span><br><span> },</span><br><span> };</span><br><span> </span><br><span>diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c</span><br><span>index 0b9f6d9..1b3cc8e 100644</span><br><span>--- a/tests/nanobts_omlattr/nanobts_omlattr_test.c</span><br><span>+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c</span><br><span>@@ -163,7 +163,7 @@</span><br><span> bts->location_area_code = 1;</span><br><span> bts->gprs.rac = 0;</span><br><span> uint8_t attr_bts_expected[] =</span><br><span style="color: hsl(0, 100%, 40%);">- { 0x19, 0x55, 0x5b, 0x61, 0x67, 0x6d, 0x73, 0x18, 0x06, 0x0e, 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0x19, 0x73, 0x6d, 0x67, 0x61, 0x5b, 0x55, 0x18, 0x06, 0x0e, 0x00,</span><br><span> 0x02, 0x01, 0x20, 0x33, 0x1e, 0x24, 0x24, 0xa8, 0x34, 0x21,</span><br><span> 0xa8, 0x1f, 0x3f, 0x25,</span><br><span> 0x00, 0x01, 0x0a, 0x0c, 0x0a, 0x0b, 0x01, 0x2a, 0x5a, 0x2b,</span><br><span>diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok</span><br><span>index 2f3ff77..e1029a4 100644</span><br><span>--- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok</span><br><span>+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok</span><br><span>@@ -1,6 +1,6 @@</span><br><span> Testing nanobts_attr_bts_get()...</span><br><span style="color: hsl(0, 100%, 40%);">-result= 19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539</span><br><span style="color: hsl(0, 100%, 40%);">-expected=19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539</span><br><span style="color: hsl(120, 100%, 40%);">+result= 19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539</span><br><span style="color: hsl(120, 100%, 40%);">+expected=19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539</span><br><span> ok.</span><br><span> </span><br><span> Testing nanobts_attr_nse_get()...</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26133">change 26133</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-bsc/+/26133"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie9bf4bf0c89418685b8ea5096332d22cfba7c521 </div>
<div style="display:none"> Gerrit-Change-Number: 26133 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>