<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24430">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RSL: rx and tx VAMOS Channel Number cbits for VAMOS lchans<br><br>Add the Osmocom-specific extension to indicate VAMOS shadow lchans in<br>RSL, in lchan lookup and RSL message transmission.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: I957eff0d2c33ec795eda75a4bff21965b0179f73<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bts_trx.c<br>M src/osmo-bsc/gsm_data.c<br>4 files changed, 26 insertions(+), 8 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/30/24430/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index a781e6b..deadc4d 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1026,7 +1026,7 @@</span><br><span> const struct abis_om_obj_inst *obj_inst);</span><br><span> </span><br><span> uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ts_nr, uint8_t lchan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ts_nr, uint8_t lchan_nr, bool vamos_is_secondary);</span><br><span> uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan);</span><br><span> uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan,</span><br><span> enum gsm_phys_chan_config as_pchan);</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index b2fc573..dce93a6 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -2536,7 +2536,7 @@</span><br><span> dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh));</span><br><span> init_dchan_hdr(dh, activate ? RSL_MT_IPAC_PDCH_ACT : RSL_MT_IPAC_PDCH_DEACT);</span><br><span> dh->c.msg_discr = ABIS_RSL_MDISC_DED_CHAN;</span><br><span style="color: hsl(0, 100%, 40%);">- dh->chan_nr = gsm_pchan2chan_nr(GSM_PCHAN_TCH_F, ts->nr, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ dh->chan_nr = gsm_pchan2chan_nr(GSM_PCHAN_TCH_F, ts->nr, 0, false);</span><br><span> </span><br><span> msg->dst = ts->trx->rsl_link_primary;</span><br><span> return abis_rsl_sendmsg(msg);</span><br><span>diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index 57b6ccc..ecfde5d 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -151,6 +151,7 @@</span><br><span> uint8_t cbits = chan_nr >> 3;</span><br><span> uint8_t lch_idx;</span><br><span> struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vamos = false;</span><br><span> bool ok;</span><br><span> </span><br><span> if (rc)</span><br><span>@@ -161,11 +162,18 @@</span><br><span> * of checking the current pchan mode, we must allow any pchans that a dyn TS is capable of. */</span><br><span> </span><br><span> switch (cbits) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs:</span><br><span style="color: hsl(120, 100%, 40%);">+ vamos = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fall thru */</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs:</span><br><span> lch_idx = 0; /* TCH/F */</span><br><span> ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F)</span><br><span> || ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(0):</span><br><span style="color: hsl(120, 100%, 40%);">+ case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(1):</span><br><span style="color: hsl(120, 100%, 40%);">+ vamos = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fall thru */</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(0):</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(1):</span><br><span> lch_idx = cbits & 0x1; /* TCH/H */</span><br><span>@@ -207,6 +215,8 @@</span><br><span> if (rc && ok)</span><br><span> *rc = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (vamos)</span><br><span style="color: hsl(120, 100%, 40%);">+ lch_idx += ts->max_primary_lchans;</span><br><span> return &ts->lchan[lch_idx];</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 5f8b6da..29a1c42 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -493,7 +493,7 @@</span><br><span> </span><br><span> /* See Table 10.5.25 of GSM04.08 */</span><br><span> uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ts_nr, uint8_t lchan_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ts_nr, uint8_t lchan_nr, bool vamos_is_secondary)</span><br><span> {</span><br><span> uint8_t cbits, chan_nr;</span><br><span> </span><br><span>@@ -501,7 +501,10 @@</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span> OSMO_ASSERT(lchan_nr == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- cbits = 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vamos_is_secondary)</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = 0x01;</span><br><span> break;</span><br><span> case GSM_PCHAN_PDCH:</span><br><span> OSMO_ASSERT(lchan_nr == 0);</span><br><span>@@ -509,8 +512,12 @@</span><br><span> break;</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span> OSMO_ASSERT(lchan_nr < 2);</span><br><span style="color: hsl(0, 100%, 40%);">- cbits = 0x02;</span><br><span style="color: hsl(0, 100%, 40%);">- cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vamos_is_secondary)</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(lchan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = 0x02;</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> case GSM_PCHAN_CCCH_SDCCH4:</span><br><span> case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span>@@ -552,7 +559,7 @@</span><br><span> * a primary ts->lchan[0] and a VAMOS ts->lchan[1]. Still, the VAMOS lchan should send chan_nr = 0. */</span><br><span> if (lchan->vamos.is_secondary)</span><br><span> lchan_nr -= lchan->ts->max_primary_lchans;</span><br><span style="color: hsl(0, 100%, 40%);">- return gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan_nr, lchan->vamos.is_secondary);</span><br><span> }</span><br><span> </span><br><span> static const uint8_t subslots_per_pchan[] = {</span><br><span>@@ -733,7 +740,8 @@</span><br><span> const struct gsm_lchan *lchan,</span><br><span> uint8_t tsc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- cd->chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ cd->chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->vamos.is_secondary);</span><br><span> _chan_desc_fill_tail(cd, lchan, tsc);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24430">change 24430</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-bsc/+/24430"/><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-Change-Id: I957eff0d2c33ec795eda75a4bff21965b0179f73 </div>
<div style="display:none"> Gerrit-Change-Number: 24430 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>