Change in osmo-bsc[master]: osmo_bsc_msc: Use meaningful amr rate configuration on BTS level

dexter gerrit-no-reply at lists.osmocom.org
Fri Mar 1 17:06:26 UTC 2019


dexter has uploaded this change for review. ( https://gerrit.osmocom.org/13092


Change subject: osmo_bsc_msc: Use meaningful amr rate configuration on BTS level
......................................................................

osmo_bsc_msc: Use meaningful amr rate configuration on BTS level

The current configuration for permittet AMR rates on BTS level contradicts the
default settings of the AMR rates for MSC level. Lets make sure that the BTS
default matches the default config on MSC level.

Change-Id: I916953e3fdb54168671dd13b359e78662fa31059
Related: SYS#4470
---
M src/osmo-bsc/gsm_data.c
1 file changed, 17 insertions(+), 18 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/13092/1

diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 5d667bb..2bb22eb 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -896,26 +896,25 @@
 	};
 
 	/* Set reasonable defaults for AMR-FR and AMR-HR rate configuration.
-	 * It is possible to set up to 4 codecs per active set, while 5,15K must
-	 * be selected. */
+	 * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */
 	mr_cfg = (struct gsm48_multi_rate_conf) {
-		.m4_75 = 0,
-		.m5_15 = 1,
+		.m4_75 = 1,
+		.m5_15 = 0,
 		.m5_90 = 1,
 		.m6_70 = 0,
-		.m7_40 = 0,
+		.m7_40 = 1,
 		.m7_95 = 0,
-		.m10_2 = 1,
+		.m10_2 = 0,
 		.m12_2 = 1
 	};
 	memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie));
-	bts->mr_full.ms_mode[0].mode = 1;
+	bts->mr_full.ms_mode[0].mode = 0;
 	bts->mr_full.ms_mode[1].mode = 2;
-	bts->mr_full.ms_mode[2].mode = 6;
+	bts->mr_full.ms_mode[2].mode = 4;
 	bts->mr_full.ms_mode[3].mode = 7;
-	bts->mr_full.bts_mode[0].mode = 1;
+	bts->mr_full.bts_mode[0].mode = 0;
 	bts->mr_full.bts_mode[1].mode = 2;
-	bts->mr_full.bts_mode[2].mode = 6;
+	bts->mr_full.bts_mode[2].mode = 4;
 	bts->mr_full.bts_mode[3].mode = 7;
 	for (i = 0; i < 3; i++) {
 		bts->mr_full.ms_mode[i].hysteresis = 8;
@@ -926,31 +925,31 @@
 	bts->mr_full.num_modes = 4;
 
 	mr_cfg = (struct gsm48_multi_rate_conf) {
-		.m4_75 = 0,
-		.m5_15 = 1,
+		.m4_75 = 1,
+		.m5_15 = 0,
 		.m5_90 = 1,
 		.m6_70 = 0,
 		.m7_40 = 1,
-		.m7_95 = 1,
+		.m7_95 = 0,
 		.m10_2 = 0,
 		.m12_2 = 0
 	};
 	memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie));
-	bts->mr_half.ms_mode[0].mode = 1;
+	bts->mr_half.ms_mode[0].mode = 0;
 	bts->mr_half.ms_mode[1].mode = 2;
 	bts->mr_half.ms_mode[2].mode = 4;
-	bts->mr_half.ms_mode[3].mode = 5;
-	bts->mr_half.bts_mode[0].mode = 1;
+	bts->mr_half.ms_mode[3].mode = 7;
+	bts->mr_half.bts_mode[0].mode = 0;
 	bts->mr_half.bts_mode[1].mode = 2;
 	bts->mr_half.bts_mode[2].mode = 4;
-	bts->mr_half.bts_mode[3].mode = 5;
+	bts->mr_half.bts_mode[3].mode = 7;
 	for (i = 0; i < 3; i++) {
 		bts->mr_half.ms_mode[i].hysteresis = 8;
 		bts->mr_half.ms_mode[i].threshold = 32;
 		bts->mr_half.bts_mode[i].hysteresis = 8;
 		bts->mr_half.bts_mode[i].threshold = 32;
 	}
-	bts->mr_half.num_modes = 4;
+	bts->mr_half.num_modes = 3;
 
 	return bts;
 }

-- 
To view, visit https://gerrit.osmocom.org/13092
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I916953e3fdb54168671dd13b359e78662fa31059
Gerrit-Change-Number: 13092
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190301/412b4392/attachment.html>


More information about the gerrit-log mailing list