<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10868">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_select: Don't attempt to allocate CBCH sub-slots<br><br>In case a given channel combination contains a CBCH, it<br>replaces the SDCCH with sub-slot 2, i.e. we cannot try to<br>allocate the same sub-slot for SDCCH anymore.<br><br>Change-Id: I13ea737e7f74bdef671540bd047af7eb604f3730<br>---<br>M src/osmo-bsc/lchan_select.c<br>1 file changed, 13 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/10868/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c</span><br><span>index 742c7de..a72e0c4 100644</span><br><span>--- a/src/osmo-bsc/lchan_select.c</span><br><span>+++ b/src/osmo-bsc/lchan_select.c</span><br><span>@@ -29,6 +29,18 @@</span><br><span> </span><br><span> #include <osmocom/bsc/lchan_select.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* return if the given lchan represents a SDCCH sub-slot that was replaced by CBCH */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool lchan_is_cbch(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (ts->pchan_is == GSM_PCHAN_CCCH_SDCCH4_CBCH && lchan->nr == 2)</span><br><span style="color: hsl(120, 100%, 40%);">+               return true;</span><br><span style="color: hsl(120, 100%, 40%);">+  else if (ts->pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH && lchan->nr == 2)</span><br><span style="color: hsl(120, 100%, 40%);">+               return true;</span><br><span style="color: hsl(120, 100%, 40%);">+  else</span><br><span style="color: hsl(120, 100%, 40%);">+          return false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct gsm_lchan *</span><br><span> _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan,</span><br><span>         enum gsm_phys_chan_config as_pchan)</span><br><span>@@ -80,7 +92,7 @@</span><br><span> </span><br><span>             /* TS is (going to be) in desired pchan mode. Go ahead and check for an available lchan. */</span><br><span>          ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) {</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (lchan->fi->state == LCHAN_ST_UNUSED) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      if (!lchan_is_cbch(lchan) && lchan->fi->state == LCHAN_ST_UNUSED) {</span><br><span>                            LOGPLCHANALLOC("%s ss=%d is available%s\n",</span><br><span>                                               gsm_ts_and_pchan_name(ts), lchan->nr,</span><br><span>                                             ts->pchan_is != as_pchan ? " after dyn PCHAN change" : "");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10868">change 10868</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/10868"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I13ea737e7f74bdef671540bd047af7eb604f3730 </div>
<div style="display:none"> Gerrit-Change-Number: 10868 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>