<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18837">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">A-bis/OML: handle hopping params in Set Channel Attributes<br><br>Change-Id: Ieac26c7aca118c16889cdde2565a514681dc137b<br>Related: OS#4546<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/gsm_data_shared.c<br>M src/common/oml.c<br>3 files changed, 41 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/37/18837/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index c3dba3c..b6a0db7 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -315,15 +315,11 @@</span><br><span> </span><br><span> struct {</span><br><span> /* Parameters below are configured by VTY */</span><br><span style="color: hsl(0, 100%, 40%);">- int enabled;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enabled;</span><br><span> uint8_t maio;</span><br><span> uint8_t hsn;</span><br><span style="color: hsl(0, 100%, 40%);">- struct bitvec arfcns;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t arfcns_data[1024/8];</span><br><span style="color: hsl(0, 100%, 40%);">- /* This is the pre-computed MA for channel assignments */</span><br><span style="color: hsl(0, 100%, 40%);">- struct bitvec ma;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ma_len; /* part of ma_data that is used */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ma_data[8]; /* 10.5.2.21: max 8 bytes value part */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t ma[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ma_len;</span><br><span> } hopping;</span><br><span> </span><br><span> struct gsm_lchan lchan[TS_MAX_LCHAN];</span><br><span>diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c</span><br><span>index c680001..3ca51ae 100644</span><br><span>--- a/src/common/gsm_data_shared.c</span><br><span>+++ b/src/common/gsm_data_shared.c</span><br><span>@@ -209,11 +209,6 @@</span><br><span> gsm_mo_init(&ts->mo, bts, NM_OC_CHANNEL,</span><br><span> bts->nr, trx->nr, ts->nr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ts->hopping.arfcns.data_len = sizeof(ts->hopping.arfcns_data);</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hopping.arfcns.data = ts->hopping.arfcns_data;</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hopping.ma.data_len = sizeof(ts->hopping.ma_data);</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hopping.ma.data = ts->hopping.ma_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> for (l = 0; l < TS_MAX_LCHAN; l++) {</span><br><span> struct gsm_lchan *lchan;</span><br><span> char *name;</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 28fa066..ea90c30 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -872,7 +872,7 @@</span><br><span> struct abis_om_fom_hdr *foh = msgb_l3(msg);</span><br><span> struct gsm_bts *bts = ts->trx->bts;</span><br><span> struct tlv_parsed tp, *tp_merged;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc, i;</span><br><span> </span><br><span> DEBUGPFOH(DOML, foh, "Rx SET CHAN ATTR\n");</span><br><span> </span><br><span>@@ -883,11 +883,39 @@</span><br><span> return oml_fom_ack_nack(msg, NM_NACK_INCORR_STRUCT);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 9.4.21 HSN... */</span><br><span style="color: hsl(0, 100%, 40%);">- /* 9.4.27 MAIO */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check frequency hopping parameters (HSN, MAIO, ARFCN list) */</span><br><span> if (TLVP_PRESENT(&tp, NM_ATT_HSN) || TLVP_PRESENT(&tp, NM_ATT_MAIO)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFOH(DOML, LOGL_NOTICE, foh, "SET CHAN ATTR: Frequency hopping not supported.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return oml_fom_ack_nack(msg, NM_NACK_SPEC_IMPL_NOTSUPP);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_bts_has_feature(bts->features, BTS_FEAT_HOPPING)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_NOTICE, foh, "SET CHAN ATTR: Frequency hopping not supported.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_fom_ack_nack(msg, NM_NACK_SPEC_IMPL_NOTSUPP);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!TLVP_PRES_LEN(&tp, NM_ATT_HSN, 1) || !TLVP_PRES_LEN(&tp, NM_ATT_MAIO, 1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_NOTICE, foh, "SET CHAN ATTR: HSN and/or MAIO is missing: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "hsn=%u, maio=%u\n", TLVP_LEN(&tp, NM_ATT_HSN), TLVP_LEN(&tp, NM_ATT_MAIO));</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_fom_ack_nack(msg, NM_NACK_ATTRLIST_INCONSISTENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!TLVP_PRES_LEN(&tp, NM_ATT_ARFCN_LIST, 2)) { /* At least one ARFCN */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_NOTICE, foh, "SET CHAN ATTR: ARFCN list is missing\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_fom_ack_nack(msg, NM_NACK_ATTRLIST_INCONSISTENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_LEN(&tp, NM_ATT_ARFCN_LIST) > sizeof(ts->hopping.ma)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_NOTICE, foh, "SET CHAN ATTR: ARFCN list is too long\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_fom_ack_nack(msg, NM_NACK_ATTRLIST_INCONSISTENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (TLVP_LEN(&tp, NM_ATT_ARFCN_LIST) % 2 != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_NOTICE, foh, "SET CHAN ATTR: ARFCN list has odd length\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return oml_fom_ack_nack(msg, NM_NACK_ATTRLIST_INCONSISTENT);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.enabled = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.hsn = *TLVP_VAL(&tp, NM_ATT_HSN);</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.maio = *TLVP_VAL(&tp, NM_ATT_MAIO);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.ma_len = TLVP_LEN(&tp, NM_ATT_ARFCN_LIST) / 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ts->hopping.ma_len; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.ma[i] = osmo_load16be(TLVP_VAL(&tp, NM_ATT_ARFCN_LIST) + i * 2);</span><br><span> }</span><br><span> </span><br><span> /* 9.4.52 Starting Time */</span><br><span>@@ -928,8 +956,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 9.4.5 ARFCN List */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* 9.4.60 TSC */</span><br><span> if (TLVP_PRES_LEN(&tp, NM_ATT_TSC, 1)) {</span><br><span> ts->tsc = *TLVP_VAL(&tp, NM_ATT_TSC);</span><br><span>@@ -937,8 +963,12 @@</span><br><span> /* If there is no TSC specified, use the BCC */</span><br><span> ts->tsc = BSIC2BCC(bts->bsic);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFOH(DOML, LOGL_INFO, foh, "SET CHAN ATTR (TSC=%u pchan=%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DOML, LOGL_INFO, foh, "SET CHAN ATTR (TSC=%u pchan=%s",</span><br><span> ts->tsc, gsm_pchan_name(ts->pchan));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->hopping.enabled)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DOML, LOGL_INFO, " hsn=%u maio=%u ma_len=%u",</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.hsn, ts->hopping.maio, ts->hopping.ma_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DOML, LOGL_INFO, ")\n");</span><br><span> </span><br><span> /* call into BTS driver to apply new attributes to hardware */</span><br><span> return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18837">change 18837</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/c/osmo-bts/+/18837"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ieac26c7aca118c16889cdde2565a514681dc137b </div>
<div style="display:none"> Gerrit-Change-Number: 18837 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>