<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10853">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce gsm48_lchan2chan_desc_as_configured()<br><br>gsm48_lchan2chan_desc_as_configured() is similar to gsm48_lchan2chan_desc(),<br>but uses the *configured* channel combination, rather than the currently<br>active one.<br><br>Change-Id: Id4043218fb770e8420f19a4ef9428680ecdfd286<br>Related: OS#3532<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/gsm_data.c<br>2 files changed, 20 insertions(+), 5 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 68f888f..e408ff9 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1200,6 +1200,7 @@</span><br><span> </span><br><span> void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span>                       const struct gsm_lchan *lchan);</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> </span><br><span> /* return the gsm_lchan for the CBCH (if it exists at all) */</span><br><span> struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts);</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index ac965e2..12ab66e 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1329,13 +1329,10 @@</span><br><span>                 gsm_trx_all_ts_dispatch(trx, ts_ev, data);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-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%);">+static void _chan_desc_fill_tail(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    cd->chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span>   if (!lchan->ts->hopping.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+              uint16_t arfcn = lchan->ts->trx->arfcn & 0x3ff;</span><br><span>                 cd->h0.tsc = gsm_ts_tsc(lchan->ts);</span><br><span>            cd->h0.h = 0;</span><br><span>             cd->h0.arfcn_high = arfcn >> 8;</span><br><span>@@ -1349,6 +1346,23 @@</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void 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%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  cd->chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+    _chan_desc_fill_tail(cd, lchan);</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%);">+/* like gsm48_lchan2chan_desc() above, but use ts->pchan_from_config to</span><br><span style="color: hsl(120, 100%, 40%);">+ * return a channel description based on what is configured, rather than</span><br><span style="color: hsl(120, 100%, 40%);">+ * what the current state of the pchan type is */</span><br><span style="color: hsl(120, 100%, 40%);">+void gsm48_lchan2chan_desc_as_configured(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%);">+{</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%);">+    _chan_desc_fill_tail(cd, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bool nm_is_running(const struct gsm_nm_state *s) {</span><br><span>  return (s->operational == NM_OPSTATE_ENABLED) && (</span><br><span>                (s->availability == NM_AVSTATE_OK) ||</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10853">change 10853</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/10853"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id4043218fb770e8420f19a4ef9428680ecdfd286 </div>
<div style="display:none"> Gerrit-Change-Number: 10853 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>