<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11005">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CBCH: Fix CBCH implementation for osmo-bts-trx<br><br>Unfortunately the code in Icc15603079a1709ec094f400a9bcf0008211890f<br>was incomplete as it missed a few spots where the CBCH-enabled channel<br>types weren't yet covered.<br><br>Using this patch I can both still perform RACH / Location Update as<br>well as actually receive SMSCB messages on an attached phone (Galaxy S5).<br><br>Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6<br>Closes: OS#1617<br>Closes: OS#3559<br>---<br>M src/osmo-bts-trx/l1_if.c<br>1 file changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/11005/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index 2b4f5c8..faff3a0 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -48,9 +48,11 @@</span><br><span>     [GSM_PCHAN_NONE]                = 8,</span><br><span>         [GSM_PCHAN_CCCH]                = 4,</span><br><span>         [GSM_PCHAN_CCCH_SDCCH4]         = 5,</span><br><span style="color: hsl(120, 100%, 40%);">+  [GSM_PCHAN_CCCH_SDCCH4_CBCH]    = 5,</span><br><span>         [GSM_PCHAN_TCH_F]               = 1,</span><br><span>         [GSM_PCHAN_TCH_H]               = 3,</span><br><span>         [GSM_PCHAN_SDCCH8_SACCH8C]      = 7,</span><br><span style="color: hsl(120, 100%, 40%);">+  [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 7,</span><br><span>         [GSM_PCHAN_PDCH]                = 13,</span><br><span>        /* [GSM_PCHAN_TCH_F_PDCH] not needed here, see trx_set_ts_as_pchan() */</span><br><span>      [GSM_PCHAN_UNKNOWN]             = 0,</span><br><span>@@ -268,7 +270,8 @@</span><br><span>   trx_sched_reset(&l1h->l1s);</span><br><span> </span><br><span>       /* deactivate lchan for CCCH */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) {</span><br><span style="color: hsl(120, 100%, 40%);">+      if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span style="color: hsl(120, 100%, 40%);">+          pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {</span><br><span>           lchan_set_state(&trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_INACTIVE);</span><br><span>     }</span><br><span> </span><br><span>@@ -378,7 +381,8 @@</span><br><span>          return NM_NACK_RES_NOTAVAIL;</span><br><span> </span><br><span>     /* activate lchan for CCCH */</span><br><span style="color: hsl(0, 100%, 40%);">-   if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4) {</span><br><span style="color: hsl(120, 100%, 40%);">+      if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span style="color: hsl(120, 100%, 40%);">+          pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) {</span><br><span>           ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span>           lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);</span><br><span>      }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11005">change 11005</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/11005"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I311b141668549ef37054cbe74be66bf17ac1d7e6 </div>
<div style="display:none"> Gerrit-Change-Number: 11005 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>