Change in osmo-bsc[master]: gsm_data: use ascending order for interference boundaries

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

fixeria gerrit-no-reply at lists.osmocom.org
Wed Nov 10 13:10:35 UTC 2021


fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26133 )

Change subject: gsm_data: use ascending order for interference boundaries
......................................................................

gsm_data: use ascending order for interference boundaries

It's more logical to have the boundaries sorted in ascending order:

  * band 1 represents lowest interference levels,
  * band 5 represents highest interference levels.

Change-Id: Ie9bf4bf0c89418685b8ea5096332d22cfba7c521
Related: SYS#5313
---
M doc/manuals/chapters/interf_meas.adoc
M src/osmo-bsc/gsm_data.c
M tests/nanobts_omlattr/nanobts_omlattr_test.c
M tests/nanobts_omlattr/nanobts_omlattr_test.ok
4 files changed, 16 insertions(+), 16 deletions(-)

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/doc/manuals/chapters/interf_meas.adoc b/doc/manuals/chapters/interf_meas.adoc
index 62b08c4..c82ff49 100644
--- a/doc/manuals/chapters/interf_meas.adoc
+++ b/doc/manuals/chapters/interf_meas.adoc
@@ -19,7 +19,7 @@
 network
  bts 0
   interference-meas avg-period 6 <1>
-  interference-meas level-bounds -85 <2> -91 -97 -103 -109 -115 <3>
+  interference-meas level-bounds -115 <2> -109 -103 -97 -91 -85 <3>
 ----
 <1> Averaging period (`Intave`) in SACCH multiframe periods (480ms).
 <2> Interference level boundary `0` (in dBm).
@@ -34,11 +34,11 @@
 averaged interference levels (initially in dBm) into these 5 bands.
 
 ----
--85 dBm    -91 dBm    -97 dBm   -103 dBm   -109 dBm   -115 dBm
-   | <1>      | <2>      | <3>      | <4>      | <5>      | <6>
-   +----------+----------+----------+----------+----------+
-   |  band 1  |  band 2  |  band 3  |  band 4  |  band 5  |
-   +----------+----------+----------+----------+----------+
+-115 dBm   -109 dBm   -103 dBm    -97 dBm    -91 dBm    -85 dBm
+    | <1>      | <2>      | <3>      | <4>      | <5>      | <6>
+    +----------+----------+----------+----------+----------+
+    |  band 1  |  band 2  |  band 3  |  band 4  |  band 5  |
+    +----------+----------+----------+----------+----------+
 ----
 <1> Interference level boundary `0` (outer).
 <2> Interference level boundary `X1`.
@@ -49,7 +49,7 @@
 
 Unfortunately, it's not clearly defined by 3GPP how the BTS is supposed to map
 dBm values outside of the outer boundaries (`0` and `X5`) to band values.  The
-ip.access nanoBTS, for example, would map values -75 dBm and -120 dBm to bands
+ip.access nanoBTS, for example, would map values -120 dBm and -75 dBm to bands
 1 and 5, respectively.  osmo-bts replicates this behavior.
 
 === PDCH and dynamic timeslot handling
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 0134e34..988d70e 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -1120,12 +1120,12 @@
 const struct gsm_interf_meas_params interf_meas_params_def = {
 	.avg_period = 6, /* 6 SACCH periods */
 	.bounds_dbm = {
-		 85, /*  0:  -85 dBm */
-		 91, /* X1:  -91 dBm */
-		 97, /* X2:  -97 dBm */
-		103, /* X3: -103 dBm */
-		109, /* X4: -109 dBm */
-		115, /* X5: -115 dBm */
+		115, /*  0: -115 dBm */
+		109, /* X1: -109 dBm */
+		103, /* X2: -103 dBm */
+		 97, /* X3:  -97 dBm */
+		 91, /* X4:  -91 dBm */
+		 85, /* X5:  -85 dBm */
 	},
 };
 
diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c
index 0b9f6d9..1b3cc8e 100644
--- a/tests/nanobts_omlattr/nanobts_omlattr_test.c
+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c
@@ -163,7 +163,7 @@
 	bts->location_area_code = 1;
 	bts->gprs.rac = 0;
 	uint8_t attr_bts_expected[] =
-	    { 0x19, 0x55, 0x5b, 0x61, 0x67, 0x6d, 0x73, 0x18, 0x06, 0x0e, 0x00,
+	    { 0x19, 0x73, 0x6d, 0x67, 0x61, 0x5b, 0x55, 0x18, 0x06, 0x0e, 0x00,
 		0x02, 0x01, 0x20, 0x33, 0x1e, 0x24, 0x24, 0xa8, 0x34, 0x21,
 		0xa8, 0x1f, 0x3f, 0x25,
 		0x00, 0x01, 0x0a, 0x0c, 0x0a, 0x0b, 0x01, 0x2a, 0x5a, 0x2b,
diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok
index 2f3ff77..e1029a4 100644
--- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok
+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok
@@ -1,6 +1,6 @@
 Testing nanobts_attr_bts_get()...
-result=  19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539
-expected=19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539
+result=  19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539
+expected=19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539
 ok.
 
 Testing nanobts_attr_nse_get()...

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26133
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie9bf4bf0c89418685b8ea5096332d22cfba7c521
Gerrit-Change-Number: 26133
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211110/a843a564/attachment.htm>


More information about the gerrit-log mailing list