Change in osmo-bsc[master]: om2k: Use the "from config" TS config to setup OM objects

[tnt]

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18117 )


Change subject: om2k: Use the "from config" TS config to setup OM objects
......................................................................

om2k: Use the "from config" TS config to setup OM objects

During the configuration of the TS object through OML we must use
pchan_from_config since it's too early to use anything else.

Signed-off-by: Sylvain Munaut <tnt at 246tNt.com>
Change-Id: Iecdc911a79b66d8f3d746347710ad697cb288174
---
M src/osmo-bsc/abis_om2000.c
1 file changed, 3 insertions(+), 3 deletions(-)



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

diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c
index e1c143f..304f873 100644
--- a/src/osmo-bsc/abis_om2000.c
+++ b/src/osmo-bsc/abis_om2000.c
@@ -1375,7 +1375,7 @@
 		 * message for it. Rather fail completely right now: */
 		return 0;
 	}
-	return pchan2comb(ts->pchan_is);
+	return pchan2comb(ts->pchan_from_config);
 }
 
 static int put_freq_list(uint8_t *buf, uint16_t arfcn)
@@ -1438,7 +1438,7 @@
 	msgb_tv_put(msg, OM2K_DEI_EXT_RANGE, 0); /* Off */
 	/* Optional: Interference Rejection Combining */
 	msgb_tv_put(msg, OM2K_DEI_INTERF_REJ_COMB, 0x00);
-	switch (ts->pchan_is) {
+	switch (ts->pchan_from_config) {
 	case GSM_PCHAN_CCCH:
 		msgb_tv_put(msg, OM2K_DEI_BA_PA_MFRMS, 0x06);
 		msgb_tv_put(msg, OM2K_DEI_BS_AG_BKS_RES, 0x01);
@@ -1482,7 +1482,7 @@
 		msgb_tv_fixed_put(msg, OM2K_DEI_ICM_BOUND_PARAMS,
 				  sizeof(icm_bound_params), icm_bound_params);
 		msgb_tv_put(msg, OM2K_DEI_TTA, 10); /* Timer for Time Alignment */
-		if (ts->pchan_is == GSM_PCHAN_TCH_H)
+		if (ts->pchan_from_config == GSM_PCHAN_TCH_H)
 			msgb_tv_put(msg, OM2K_DEI_ICM_CHAN_RATE, 1); /* TCH/H */
 		else
 			msgb_tv_put(msg, OM2K_DEI_ICM_CHAN_RATE, 0); /* TCH/F */

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Iecdc911a79b66d8f3d746347710ad697cb288174
Gerrit-Change-Number: 18117
Gerrit-PatchSet: 1
Gerrit-Owner: tnt <tnt at 246tNt.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200508/2ab78151/attachment.htm>