<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25163">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">introduce gsm48_lchan_and_pchan2chan_desc()<br><br>The function gsm48_lchan2chan_desc_as_configured() dups<br>gsm48_lchan2chan_desc() with merely a different pchan type<br>(ts->pchan_from_config instead of ts->pchan_is).<br><br>In an upcoming patch, I would like to do the same, just with yet another<br>pchan value (derived from lchan->type, because that reflects the channel<br>type even before a dynamic timeslot switched its pchan type).<br><br>So replace gsm48_lchan2chan_desc_as_configured() by<br>gsm48_lchan_and_pchan2chan_desc() with explicit pchan arg;<br>also call this from gsm48_lchan2chan_desc(), reducing code dup.<br><br>gsm48_lchan2chan_desc_as_configured() had more concise error logging.<br>Absorb that into the new gsm48_lchan_and_pchan2chan_desc().<br><br>Add gsm_lchan_and_pchan2chan_nr(), like gsm_lchan2chan_nr() just with<br>explicit pchan arg, to be able to pass the pchan down from the new<br>functions mentioned above.<br><br>Related: SYS#5559<br>Change-Id: I67f178c8160cdda1f2ab5513ac4f65c027d4012f<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/system_information.c<br>3 files changed, 29 insertions(+), 30 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/63/25163/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 5a20e72..31711c7 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1075,12 +1075,15 @@</span><br><span> int gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,</span><br><span> uint8_t ts_nr, uint8_t lchan_nr, bool vamos_is_secondary);</span><br><span> int gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool allow_osmo_cbits);</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm_lchan_and_pchan2chan_nr(const struct gsm_lchan *lchan, enum gsm_phys_chan_config pchan, bool allow_osmo_cbits);</span><br><span> </span><br><span> int gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span> const struct gsm_lchan *lchan,</span><br><span> uint8_t tsc, bool allow_osmo_cbits);</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_lchan_and_pchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc, bool allow_osmo_cbits);</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/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 4db70f0..e976a5b 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -562,7 +562,7 @@</span><br><span> /* For RSL, to talk to osmo-bts, we introduce Osmocom specific channel number cbits to indicate VAMOS secondary lchans.</span><br><span> * However, in RR, which is sent to the MS, these special cbits must not be sent, but their "normal" equivalent; for RR</span><br><span> * messages, pass allow_osmo_cbits = false. */</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool allow_osmo_cbits)</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm_lchan_and_pchan2chan_nr(const struct gsm_lchan *lchan, enum gsm_phys_chan_config pchan, bool allow_osmo_cbits)</span><br><span> {</span><br><span> int rc;</span><br><span> uint8_t lchan_nr = lchan->nr;</span><br><span>@@ -582,7 +582,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%);">- rc = gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_pchan2chan_nr(pchan, lchan->ts->nr, lchan_nr,</span><br><span> allow_osmo_cbits ? lchan->vamos.is_secondary : false);</span><br><span> /* Log an error so that we don't need to add logging to each caller of this function */</span><br><span> if (rc < 0)</span><br><span>@@ -593,6 +593,11 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool allow_osmo_cbits)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm_lchan_and_pchan2chan_nr(lchan, lchan->ts->pchan_is, allow_osmo_cbits);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const uint8_t subslots_per_pchan[] = {</span><br><span> [GSM_PCHAN_NONE] = 0,</span><br><span> [GSM_PCHAN_CCCH] = 0,</span><br><span>@@ -712,14 +717,18 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int 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%);">- uint8_t tsc, bool allow_osmo_cbits)</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_lchan_and_pchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc, bool allow_osmo_cbits)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan, allow_osmo_cbits);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan_and_pchan2chan_nr(lchan, pchan, allow_osmo_cbits);</span><br><span> if (chan_nr < 0) {</span><br><span> /* Log an error so that we don't need to add logging to each caller of this function */</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_LCHAN(lchan, LOGL_ERROR, "Error encoding Channel Number\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Error encoding Channel Number: pchan %s ts %u ss %u%s (rc = %d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_pchan_name(pchan), lchan->ts->nr, lchan->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->vamos.is_secondary ? " (VAMOS shadow)" : "", chan_nr);</span><br><span> return chan_nr;</span><br><span> }</span><br><span> cd->chan_nr = chan_nr;</span><br><span>@@ -727,26 +736,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* like gsm48_lchan2chan_desc() above, but use ts->pchan_from_config to</span><br><span style="color: hsl(0, 100%, 40%);">- * return a channel description based on what is configured, rather than</span><br><span style="color: hsl(0, 100%, 40%);">- * what the current state of the pchan type is */</span><br><span style="color: hsl(0, 100%, 40%);">-int 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(0, 100%, 40%);">- uint8_t tsc)</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd,</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, bool allow_osmo_cbits)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->vamos.is_secondary);</span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_nr < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Log an error so that we don't need to add logging to each caller of this function */</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Error encoding Channel Number: pchan %s ts %u ss %u%s (rc = %d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_pchan_name(lchan->ts->pchan_from_config), lchan->ts->nr, lchan->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->vamos.is_secondary ? " (VAMOS shadow)" : "", chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- return chan_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- cd->chan_nr = chan_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- _chan_desc_fill_tail(cd, lchan, tsc);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm48_lchan_and_pchan2chan_desc(cd, lchan, lchan->ts->pchan_is, tsc, allow_osmo_cbits);</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/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index e8b3b7d..974af3a 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -1017,8 +1017,10 @@</span><br><span> const struct gsm_bts_trx_ts *ts = cbch_lchan->ts;</span><br><span> struct gsm48_chan_desc cd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 10.5.2.5 (TV) CBCH Channel Description IE */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan, gsm_ts_tsc(cbch_lchan->ts)))</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 10.5.2.5 (TV) CBCH Channel Description IE.</span><br><span style="color: hsl(120, 100%, 40%);">+ * CBCH is never in VAMOS mode, so just pass allow_osmo_cbits == false. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_lchan_and_pchan2chan_desc(&cd, cbch_lchan, cbch_lchan->ts->pchan_from_config,</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_ts_tsc(cbch_lchan->ts), false))</span><br><span> return -EINVAL;</span><br><span> tail = tv_fixed_put(tail, GSM48_IE_CBCH_CHAN_DESC,</span><br><span> sizeof(cd), (uint8_t *) &cd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25163">change 25163</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/+/25163"/><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: I67f178c8160cdda1f2ab5513ac4f65c027d4012f </div>
<div style="display:none"> Gerrit-Change-Number: 25163 </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>