<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24368">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm48_lchan2chan_desc(): expose TSC as param<br><br>Expose the training sequence code used in the RSL Channel Description IE<br>as an input parameter.<br><br>So far the Channel Description IE is always composed with a training<br>sequence code from gsm_ts_tsc(). For RSL commands enabling VAMOS mode,<br>specific training sequence codes are required.<br><br>So far, all callers still use gsm_ts_tsc(), making this a patch without<br>any functional change. Upcoming patches will pass specific TSC as<br>configured for VAMOS instead, in specific places.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: I49503a6f5d25bb3bc9a0505bd79ed1d5c4f50577<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/lcs_loc_req.c<br>M src/osmo-bsc/system_information.c<br>6 files changed, 21 insertions(+), 16 deletions(-)<br><br></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 348735e..f469e41 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1003,8 +1003,10 @@</span><br><span> enum gsm_phys_chan_config as_pchan);</span><br><span> </span><br><span> void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm_lchan *lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc);</span><br><span> </span><br><span> uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 1c2b1cd..c2a2005 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -528,7 +528,7 @@</span><br><span> }</span><br><span> </span><br><span> memset(&cd, 0, sizeof(cd));</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&cd, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&cd, lchan, gsm_ts_tsc(lchan->ts));</span><br><span> </span><br><span> msg = rsl_msgb_alloc();</span><br><span> dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh));</span><br><span>@@ -1801,7 +1801,7 @@</span><br><span> ia->proto_discr = GSM48_PDISC_RR;</span><br><span> ia->msg_type = GSM48_MT_RR_IMM_ASS;</span><br><span> ia->page_mode = GSM48_PM_SAME;</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&ia->chan_desc, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&ia->chan_desc, lchan, gsm_ts_tsc(lchan->ts));</span><br><span> </span><br><span> /* use request reference extracted from CHAN_RQD */</span><br><span> memcpy(&ia->req_ref, lchan->rqd_ref, sizeof(ia->req_ref));</span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index 302ea33..153f102 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -546,7 +546,7 @@</span><br><span> </span><br><span> /* mandatory bits */</span><br><span> gsm48_cell_desc(&ho->cell_desc, new_lchan->ts->trx->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&ho->chan_desc, new_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&ho->chan_desc, new_lchan, gsm_ts_tsc(new_lchan->ts));</span><br><span> ho->ho_ref = ho_ref;</span><br><span> ho->power_command = power_command;</span><br><span> </span><br><span>@@ -618,7 +618,7 @@</span><br><span> * the chan_desc. But as long as multi-slot configurations</span><br><span> * are not used we seem to be fine.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&ass->chan_desc, new_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&ass->chan_desc, new_lchan, gsm_ts_tsc(new_lchan->ts));</span><br><span> ass->power_command = power_command;</span><br><span> </span><br><span> /* Cell Channel Description (freq. hopping), TV (see 3GPP TS 44.018, 10.5.2.1b) */</span><br><span>@@ -690,7 +690,7 @@</span><br><span> </span><br><span> /* fill the channel information element, this code</span><br><span> * should probably be shared with rsl_rx_chan_rqd() */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&cmm->chan_desc, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, gsm_ts_tsc(lchan->ts));</span><br><span> cmm->mode = mode;</span><br><span> </span><br><span> /* in case of multi rate we need to attach a config */</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 0c85503..b676e2f 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -596,17 +596,18 @@</span><br><span> return conn->lchan->ts->trx->bts;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc)</span><br><span> {</span><br><span> if (!lchan->ts->hopping.enabled) {</span><br><span> uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff;</span><br><span style="color: hsl(0, 100%, 40%);">- cd->h0.tsc = gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ cd->h0.tsc = tsc;</span><br><span> cd->h0.h = 0;</span><br><span> cd->h0.spare = 0;</span><br><span> cd->h0.arfcn_high = arfcn >> 8;</span><br><span> cd->h0.arfcn_low = arfcn & 0xff;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- cd->h1.tsc = gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ cd->h1.tsc = tsc;</span><br><span> cd->h1.h = 1;</span><br><span> cd->h1.maio_high = lchan->ts->hopping.maio >> 2;</span><br><span> cd->h1.maio_low = lchan->ts->hopping.maio & 0x03;</span><br><span>@@ -615,20 +616,22 @@</span><br><span> }</span><br><span> </span><br><span> void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc)</span><br><span> {</span><br><span> cd->chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- _chan_desc_fill_tail(cd, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ _chan_desc_fill_tail(cd, lchan, tsc);</span><br><span> }</span><br><span> </span><br><span> /* like gsm48_lchan2chan_desc() above, but use ts->pchan_from_config to</span><br><span> * return a channel description based on what is configured, rather than</span><br><span> * what the current state of the pchan type is */</span><br><span> void gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc)</span><br><span> {</span><br><span> cd->chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr);</span><br><span style="color: hsl(0, 100%, 40%);">- _chan_desc_fill_tail(cd, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ _chan_desc_fill_tail(cd, lchan, tsc);</span><br><span> }</span><br><span> </span><br><span> uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts)</span><br><span>diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c</span><br><span>index 39bc341..ef9ee27 100644</span><br><span>--- a/src/osmo-bsc/lcs_loc_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_loc_req.c</span><br><span>@@ -369,7 +369,7 @@</span><br><span> .cause = BSSLAP_CAUSE_INTRA_BSS_HO,</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc(&apdu->reset.chan_desc, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc(&apdu->reset.chan_desc, lchan, gsm_ts_tsc(lchan->ts));</span><br><span> }</span><br><span> </span><br><span> lcs_loc_req_send(lcs_loc_req, &bsslap);</span><br><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index 7ec613c..eddc650 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -1018,7 +1018,7 @@</span><br><span> struct gsm48_chan_desc cd;</span><br><span> </span><br><span> /* 10.5.2.5 (TV) CBCH Channel Description IE */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan, gsm_ts_tsc(cbch_lchan->ts));</span><br><span> tail = tv_fixed_put(tail, GSM48_IE_CBCH_CHAN_DESC,</span><br><span> sizeof(cd), (uint8_t *) &cd);</span><br><span> l2_plen += 1 + sizeof(cd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24368">change 24368</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/+/24368"/><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: I49503a6f5d25bb3bc9a0505bd79ed1d5c4f50577 </div>
<div style="display:none"> Gerrit-Change-Number: 24368 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>