Change in osmo-bsc[master]: lchan_fsm: merge lchan_mr_config()

[laforge]

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

Change subject: lchan_fsm: merge lchan_mr_config()
......................................................................

lchan_fsm: merge lchan_mr_config()

There are some preperations and checks done before calling
lchan_mr_config(), those checks could also be done from inside
lchan_mr_config(), so lets merge them into lchan_mr_config()

Change-Id: I068aadda53b2c3a85ed4fb1e513b17bf9870bd50
---
M src/osmo-bsc/lchan_fsm.c
1 file changed, 21 insertions(+), 20 deletions(-)

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



diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 4ed95dd..05fb66f 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -415,8 +415,9 @@
 }
 
 /* Configure the multirate setting on this channel. */
-static int lchan_mr_config(struct gsm_lchan *lchan, const struct gsm48_multi_rate_conf *mr_conf)
+static int lchan_mr_config(struct gsm_lchan *lchan, uint16_t s15_s0)
 {
+	struct gsm48_multi_rate_conf mr_conf;
 	bool full_rate = (lchan->type == GSM_LCHAN_TCH_F);
 	struct gsm_bts *bts = lchan->ts->trx->bts;
 	struct bsc_msc_data *msc = lchan->conn->sccp.msc;
@@ -426,6 +427,22 @@
 	struct gsm48_multi_rate_conf mr_conf_filtered;
 	const struct gsm48_multi_rate_conf *mr_conf_bts;
 
+	/* Generate mr conf struct from S15-S0 bits */
+	if (gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, s15_s0) < 0) {
+		LOG_LCHAN(lchan, LOGL_ERROR,
+			  "can not determine multirate configuration, S15-S0 (%04x) are ambiguous!\n", s15_s0);
+		return -EINVAL;
+	}
+
+	/* Do not include 12.2 kbps rate when S1 is set. */
+	if (lchan->type == GSM_LCHAN_TCH_H && (s15_s0 & GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20)) {
+		/* See also 3GPP TS 28.062, chapter 7.11.3.1.3: "In case this Configuration
+		 * "Config-NB-Code = 1" is signalled in the TFO Negotiation for the HR_AMR
+		 * Codec Type,then it shall be assumed that AMR mode 12.2 kbps is (of course)
+		 * not included. */
+		mr_conf.m12_2 = 0;
+	}
+
 	/* There are two different active sets, depending on the channel rate,
 	 * make sure the appropate one is selected. */
 	if (full_rate)
@@ -438,7 +455,7 @@
 	 * interface. To ensure that the VTY settings are observed we create
 	 * a manipulated copy of the mr_conf that ensures forbidden codec rates
 	 * are not used in the multirate configuration IE. */
-	rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, &msc->amr_conf, mr_conf);
+	rc_rate = calc_amr_rate_intersection(&mr_conf_filtered, &msc->amr_conf, &mr_conf);
 	if (rc_rate < 0) {
 		LOG_LCHAN(lchan, LOGL_ERROR,
 			  "can not encode multirate configuration (invalid amr rate setting, MSC)\n");
@@ -478,6 +495,7 @@
 		return -EINVAL;
 	}
 
+	lchan->s15_s0 = s15_s0;
 	return 0;
 }
 
@@ -508,7 +526,6 @@
 static void lchan_fsm_wait_ts_ready_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
 {
 	struct gsm_lchan *lchan = lchan_fi_lchan(fi);
-	struct gsm48_multi_rate_conf mr_conf;
 	struct gsm_bts *bts = lchan->ts->trx->bts;
 	struct osmo_mgcpc_ep_ci *use_mgwep_ci;
 	struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan;
@@ -537,26 +554,10 @@
 	}
 
 	if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) {
-		if (gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0) < 0) {
-			lchan_fail("Can not determine multirate configuration, S15-S0 (%04x) are ambiguous!\n",
-				   info->s15_s0);
-			return;
-		}
-
-		/* Do not include 12.2 kbps rate when S1 is set. */
-		if (lchan->type == GSM_LCHAN_TCH_H && (info->s15_s0 & GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20)) {
-			/* See also 3GPP TS 28.062, chapter 7.11.3.1.3: "In case this Configuration
-			 * "Config-NB-Code = 1" is signalled in the TFO Negotiation for the HR_AMR
-			 * Codec Type,then it shall be assumed that AMR mode 12.2 kbps is (of course)
-			 * not included. */
-			mr_conf.m12_2 = 0;
-		}
-
-		if (lchan_mr_config(lchan, &mr_conf) < 0) {
+		if (lchan_mr_config(lchan, info->s15_s0) < 0) {
 			lchan_fail("Can not generate multirate configuration IE\n");
 			return;
 		}
-		lchan->s15_s0 = info->s15_s0;
 	}
 
 	switch (info->chan_mode) {

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I068aadda53b2c3a85ed4fb1e513b17bf9870bd50
Gerrit-Change-Number: 19790
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-CC: daniel <dwillmann at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200825/a01a12ca/attachment.htm>