<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11427">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Convert lchan CCCH_LCHAN to chan_nr BCCH and viceversa<br><br>Before this patch it was being coded as SDCCH4 TS0 SS 0, and as a<br>result the state LCHAN_REL_ACT_OML applied in opstart_compl in abused<br>SDCCH4 TS0 SS 4 was not being checked when deciding whether to send a<br>Chan Act ACK in rsl_tx_chan_act_acknack.<br><br>Fixes: OS#3513<br>Change-Id: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397<br>---<br>M include/osmo-bts/l1sap.h<br>M src/common/gsm_data_shared.c<br>2 files changed, 8 insertions(+), 4 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/27/11427/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h</span><br><span>index e2c92fa..3cf0ea5 100644</span><br><span>--- a/include/osmo-bts/l1sap.h</span><br><span>+++ b/include/osmo-bts/l1sap.h</span><br><span>@@ -12,6 +12,7 @@</span><br><span> #define L1SAP_CHAN2SS_TCHH(chan_nr) ((chan_nr >> 3) & 1)</span><br><span> #define L1SAP_CHAN2SS_SDCCH4(chan_nr) ((chan_nr >> 3) & 3)</span><br><span> #define L1SAP_CHAN2SS_SDCCH8(chan_nr) ((chan_nr >> 3) & 7)</span><br><span style="color: hsl(120, 100%, 40%);">+#define L1SAP_CHAN2SS_BCCH(chan_nr) (CCCH_LCHAN)</span><br><span> </span><br><span> /* logical channel from chan_nr + link_id */</span><br><span> #define L1SAP_IS_LINK_SACCH(link_id) ((link_id & 0xC0) == LID_SACCH)</span><br><span>@@ -48,6 +49,8 @@</span><br><span> /* subslot from any chan_nr */</span><br><span> static inline uint8_t l1sap_chan2ss(uint8_t chan_nr)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+     if (L1SAP_IS_CHAN_BCCH(chan_nr))</span><br><span style="color: hsl(120, 100%, 40%);">+                return L1SAP_CHAN2SS_BCCH(chan_nr);</span><br><span>        if (L1SAP_IS_CHAN_SDCCH8(chan_nr))</span><br><span>           return L1SAP_CHAN2SS_SDCCH8(chan_nr);</span><br><span>        if (L1SAP_IS_CHAN_SDCCH4(chan_nr))</span><br><span>diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c</span><br><span>index 8c3229c..588d0fd 100644</span><br><span>--- a/src/common/gsm_data_shared.c</span><br><span>+++ b/src/common/gsm_data_shared.c</span><br><span>@@ -622,11 +622,12 @@</span><br><span>               * See osmo-bts-xxx/oml.c:opstart_compl().</span><br><span>            */</span><br><span>          if (lchan_nr == CCCH_LCHAN)</span><br><span style="color: hsl(0, 100%, 40%);">-                     lchan_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-           else</span><br><span style="color: hsl(120, 100%, 40%);">+                  cbits = 0x10; /* BCCH */</span><br><span style="color: hsl(120, 100%, 40%);">+              else {</span><br><span>                       OSMO_ASSERT(lchan_nr < 4);</span><br><span style="color: hsl(0, 100%, 40%);">-           cbits = 0x04;</span><br><span style="color: hsl(0, 100%, 40%);">-           cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+                    cbits = 0x04;</span><br><span style="color: hsl(120, 100%, 40%);">+                 cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+            }</span><br><span>            break;</span><br><span>       case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span>       case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11427">change 11427</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/11427"/><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: I1641960c9ffbb3ed0de74ab5b53e24e5b4ff3397 </div>
<div style="display:none"> Gerrit-Change-Number: 11427 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>