<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10851">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CBCH: Fix gsm_bts_get_cbch()<br><br>When the timeslot FSMs were introduced, the function gsm_bts_get_cbch()<br>was ported to use 'pchan_is'.  However, the function is called very<br>early, before pchan_is is actually initialized.<br><br>Let's make sure we're using the _configured_ channel combination<br>when resolving where the CBCH is (if any) in the BTS.<br><br>Ever since merging the timeslot FSMs and before this patch, SI4 would<br>never indicate the presence of a CBCH.<br><br>Change-Id: I6251b5f3e1180ad466e9349a1845e1b91f661c0b<br>Related: OS#3532<br>---<br>M src/osmo-bsc/gsm_data.c<br>1 file changed, 2 insertions(+), 2 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/51/10851/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index ac965e2..a953ce1 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1204,12 +1204,12 @@</span><br><span>   struct gsm_lchan *lchan = NULL;</span><br><span>      struct gsm_bts_trx *trx = bts->c0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       if (trx->ts[0].pchan_is == GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span style="color: hsl(120, 100%, 40%);">+     if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span>           lchan = &trx->ts[0].lchan[2];</span><br><span>         else {</span><br><span>               int i;</span><br><span>               for (i = 0; i < 8; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                    if (trx->ts[i].pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) {</span><br><span>                              lchan = &trx->ts[i].lchan[2];</span><br><span>                                 break;</span><br><span>                       }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10851">change 10851</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/10851"/><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: I6251b5f3e1180ad466e9349a1845e1b91f661c0b </div>
<div style="display:none"> Gerrit-Change-Number: 10851 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>