<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11003">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;">CBCH: Fix CBCH via L1SAP for osmo-bts-{sysmo,octphy,litecell15}<br><br>This fixes a bug introduced in "CBCH: Move processing via L1SAP"<br><br>commit 02d99db08b13589e1417c3448a07747f8805ba88<br>Author: Harald Welte <laforge@gnumonks.org><br>Date: Fri Aug 24 23:37:45 2018 +0200<br><br>where the full channel number 0xc8 was used instead of the<br>(right-shifted) C-bits only.<br><br>Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-sysmo/l1_if.c<br>3 files changed, 9 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index 82299ff..4093225 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -383,6 +383,8 @@</span><br><span> sapi = GsmL1_Sapi_Sdcch;</span><br><span> } else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {</span><br><span> sapi = GsmL1_Sapi_Bcch;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi = GsmL1_Sapi_Cbch;</span><br><span> } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {</span><br><span> /* The sapi depends on DSP configuration, not</span><br><span> * on the actual SYSTEM INFORMATION 3. */</span><br><span>@@ -700,7 +702,7 @@</span><br><span> cbits = 0x10;</span><br><span> break;</span><br><span> case GsmL1_Sapi_Cbch:</span><br><span style="color: hsl(0, 100%, 40%);">- cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */</span><br><span> break;</span><br><span> case GsmL1_Sapi_Sacch:</span><br><span> switch(pchan) {</span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index 35d0aa3..40d5300 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -357,7 +357,7 @@</span><br><span> cbits = 0x10;</span><br><span> break;</span><br><span> case cOCTVC1_GSM_SAPI_ENUM_CBCH:</span><br><span style="color: hsl(0, 100%, 40%);">- cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */</span><br><span> break;</span><br><span> case cOCTVC1_GSM_SAPI_ENUM_SACCH:</span><br><span> switch (pchan) {</span><br><span>@@ -517,6 +517,8 @@</span><br><span> sapi = cOCTVC1_GSM_SAPI_ENUM_SDCCH;</span><br><span> } else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {</span><br><span> sapi = cOCTVC1_GSM_SAPI_ENUM_BCCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi = cOCTVC1_GSM_SAPI_ENUM_CBCH;</span><br><span> } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {</span><br><span> sapi = cOCTVC1_GSM_SAPI_ENUM_PCH_AGCH;</span><br><span> } else {</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index c0b42b4..372e332 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -380,6 +380,8 @@</span><br><span> sapi = GsmL1_Sapi_Sdcch;</span><br><span> } else if (L1SAP_IS_CHAN_BCCH(chan_nr)) {</span><br><span> sapi = GsmL1_Sapi_Bcch;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi = GsmL1_Sapi_Cbch;</span><br><span> } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {</span><br><span> /* The sapi depends on DSP configuration, not</span><br><span> * on the actual SYSTEM INFORMATION 3. */</span><br><span>@@ -697,7 +699,7 @@</span><br><span> cbits = 0x10;</span><br><span> break;</span><br><span> case GsmL1_Sapi_Cbch:</span><br><span style="color: hsl(0, 100%, 40%);">- cbits = 0xc8; /* Osmocom extension for CBCH via L1SAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = 0xc8 >> 3; /* Osmocom extension for CBCH via L1SAP */</span><br><span> break;</span><br><span> case GsmL1_Sapi_Sacch:</span><br><span> switch(pchan) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11003">change 11003</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/11003"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0fd8d7762e9cc3319a534f261e8857a1aa2220e0 </div>
<div style="display:none"> Gerrit-Change-Number: 11003 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>