<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13092">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_bsc_msc: Use meaningful amr rate configuration on BTS level<br><br>The current configuration for permittet AMR rates on BTS level contradicts the<br>default settings of the AMR rates for MSC level. Lets make sure that the BTS<br>default matches the default config on MSC level.<br><br>Change-Id: I916953e3fdb54168671dd13b359e78662fa31059<br>Related: SYS#4470<br>---<br>M src/osmo-bsc/gsm_data.c<br>1 file changed, 17 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/13092/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 5d667bb..2bb22eb 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -896,26 +896,25 @@</span><br><span> };</span><br><span> </span><br><span> /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration.</span><br><span style="color: hsl(0, 100%, 40%);">- * It is possible to set up to 4 codecs per active set, while 5,15K must</span><br><span style="color: hsl(0, 100%, 40%);">- * be selected. */</span><br><span style="color: hsl(120, 100%, 40%);">+ * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */</span><br><span> mr_cfg = (struct gsm48_multi_rate_conf) {</span><br><span style="color: hsl(0, 100%, 40%);">- .m4_75 = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .m5_15 = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .m4_75 = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .m5_15 = 0,</span><br><span> .m5_90 = 1,</span><br><span> .m6_70 = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .m7_40 = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .m7_40 = 1,</span><br><span> .m7_95 = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .m10_2 = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .m10_2 = 0,</span><br><span> .m12_2 = 1</span><br><span> };</span><br><span> memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie));</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_full.ms_mode[0].mode = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_full.ms_mode[0].mode = 0;</span><br><span> bts->mr_full.ms_mode[1].mode = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_full.ms_mode[2].mode = 6;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_full.ms_mode[2].mode = 4;</span><br><span> bts->mr_full.ms_mode[3].mode = 7;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_full.bts_mode[0].mode = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_full.bts_mode[0].mode = 0;</span><br><span> bts->mr_full.bts_mode[1].mode = 2;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_full.bts_mode[2].mode = 6;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_full.bts_mode[2].mode = 4;</span><br><span> bts->mr_full.bts_mode[3].mode = 7;</span><br><span> for (i = 0; i < 3; i++) {</span><br><span> bts->mr_full.ms_mode[i].hysteresis = 8;</span><br><span>@@ -926,31 +925,31 @@</span><br><span> bts->mr_full.num_modes = 4;</span><br><span> </span><br><span> mr_cfg = (struct gsm48_multi_rate_conf) {</span><br><span style="color: hsl(0, 100%, 40%);">- .m4_75 = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .m5_15 = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .m4_75 = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .m5_15 = 0,</span><br><span> .m5_90 = 1,</span><br><span> .m6_70 = 0,</span><br><span> .m7_40 = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .m7_95 = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .m7_95 = 0,</span><br><span> .m10_2 = 0,</span><br><span> .m12_2 = 0</span><br><span> };</span><br><span> memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie));</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_half.ms_mode[0].mode = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_half.ms_mode[0].mode = 0;</span><br><span> bts->mr_half.ms_mode[1].mode = 2;</span><br><span> bts->mr_half.ms_mode[2].mode = 4;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_half.ms_mode[3].mode = 5;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_half.bts_mode[0].mode = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_half.ms_mode[3].mode = 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_half.bts_mode[0].mode = 0;</span><br><span> bts->mr_half.bts_mode[1].mode = 2;</span><br><span> bts->mr_half.bts_mode[2].mode = 4;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_half.bts_mode[3].mode = 5;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_half.bts_mode[3].mode = 7;</span><br><span> for (i = 0; i < 3; i++) {</span><br><span> bts->mr_half.ms_mode[i].hysteresis = 8;</span><br><span> bts->mr_half.ms_mode[i].threshold = 32;</span><br><span> bts->mr_half.bts_mode[i].hysteresis = 8;</span><br><span> bts->mr_half.bts_mode[i].threshold = 32;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bts->mr_half.num_modes = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->mr_half.num_modes = 3;</span><br><span> </span><br><span> return bts;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13092">change 13092</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/13092"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I916953e3fdb54168671dd13b359e78662fa31059 </div>
<div style="display:none"> Gerrit-Change-Number: 13092 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>