<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14202">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;">trxcon: Fix CBCH related RSL channel numbers<br><br>OsmoBTS, BSC and TTCN3 used cbits == 0x18 for dynamic PDCH, while<br>trxcon wanted to use 0x18 for CBCH on SDCCH/4.  Let's fix this and<br>bring everyone in agreement.<br><br>Related: OS#4027<br>Change-Id: Ia9a415628c659cbc2dd5dc65b875b7f935d6e211<br>---<br>M src/host/trxcon/sched_lchan_desc.c<br>M src/host/trxcon/sched_trx.c<br>2 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c</span><br><span>index 93639a3..ee712d5 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_desc.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_desc.c</span><br><span>@@ -304,13 +304,13 @@</span><br><span>  },</span><br><span>   [TRXC_SDCCH4_CBCH] = {</span><br><span>               TRXC_SDCCH4_CBCH,       "SDCCH/4(CBCH)",</span><br><span style="color: hsl(0, 100%, 40%);">-              0xc0,                   TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+             0xc8,                   TRX_CH_LID_DEDIC,</span><br><span>            4 * GSM_BURST_PL_LEN,   TRX_CH_FLAG_AUTO,</span><br><span>            rx_data_fn,             NULL,</span><br><span>        },</span><br><span>   [TRXC_SDCCH8_CBCH] = {</span><br><span>               TRXC_SDCCH8_CBCH,       "SDCCH/8(CBCH)",</span><br><span style="color: hsl(0, 100%, 40%);">-              0xc8,                   TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+             0xd0,                   TRX_CH_LID_DEDIC,</span><br><span>            4 * GSM_BURST_PL_LEN,   0x00,</span><br><span>                rx_data_fn,             NULL,</span><br><span>        },</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index 18516d3..721db02 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -536,11 +536,11 @@</span><br><span>          return GSM_PCHAN_TCH_H;</span><br><span>      else if ((cbits & 0x1c) == 0x04)</span><br><span>                 return GSM_PCHAN_CCCH_SDCCH4;</span><br><span style="color: hsl(0, 100%, 40%);">-   else if ((cbits & 0x1f) == 0x18)</span><br><span style="color: hsl(0, 100%, 40%);">-            return GSM_PCHAN_CCCH_SDCCH4_CBCH;</span><br><span>   else if ((cbits & 0x18) == 0x08)</span><br><span>                 return GSM_PCHAN_SDCCH8_SACCH8C;</span><br><span>     else if ((cbits & 0x1f) == 0x19)</span><br><span style="color: hsl(120, 100%, 40%);">+          return GSM_PCHAN_CCCH_SDCCH4_CBCH;</span><br><span style="color: hsl(120, 100%, 40%);">+    else if ((cbits & 0x1f) == 0x1a)</span><br><span>                 return GSM_PCHAN_SDCCH8_SACCH8C_CBCH;</span><br><span> </span><br><span>    return GSM_PCHAN_NONE;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14202">change 14202</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/14202"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia9a415628c659cbc2dd5dc65b875b7f935d6e211 </div>
<div style="display:none"> Gerrit-Change-Number: 14202 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Assignee: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <axilirator@gmail.com> </div>