<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24436">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] gsm_pchan2chan_nr(): use ABIS_RSL_CHAN_NR_CBITS_* macros<br><br>Change-Id: I2b1480d3c330951cccc15333450cf7243b9505fc<br>Related: SYS#4895, OS#4941<br>---<br>M src/common/gsm_data.c<br>1 file changed, 7 insertions(+), 10 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/36/24436/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c</span><br><span>index d0fe479..9a54912 100644</span><br><span>--- a/src/common/gsm_data.c</span><br><span>+++ b/src/common/gsm_data.c</span><br><span>@@ -187,16 +187,15 @@</span><br><span>     switch (pchan) {</span><br><span>     case GSM_PCHAN_TCH_F:</span><br><span>                OSMO_ASSERT(lchan_nr == 0);</span><br><span style="color: hsl(0, 100%, 40%);">-             cbits = 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+         cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs;</span><br><span>             break;</span><br><span>       case GSM_PCHAN_PDCH:</span><br><span>                 OSMO_ASSERT(lchan_nr == 0);</span><br><span style="color: hsl(0, 100%, 40%);">-             cbits = RSL_CHAN_OSMO_PDCH >> 3;</span><br><span style="color: hsl(120, 100%, 40%);">+                cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH;</span><br><span>            break;</span><br><span>       case GSM_PCHAN_TCH_H:</span><br><span>                OSMO_ASSERT(lchan_nr < 2);</span><br><span style="color: hsl(0, 100%, 40%);">-           cbits = 0x02;</span><br><span style="color: hsl(0, 100%, 40%);">-           cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+            cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr);</span><br><span>           break;</span><br><span>       case GSM_PCHAN_CCCH_SDCCH4:</span><br><span>  case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span>@@ -206,21 +205,19 @@</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%);">-                     cbits = 0x10; /* BCCH */</span><br><span style="color: hsl(120, 100%, 40%);">+                      cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH;</span><br><span>                 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 = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr);</span><br><span>                }</span><br><span>            break;</span><br><span>       case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span>       case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span>          OSMO_ASSERT(lchan_nr < 8);</span><br><span style="color: hsl(0, 100%, 40%);">-           cbits = 0x08;</span><br><span style="color: hsl(0, 100%, 40%);">-           cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+            cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr);</span><br><span>                break;</span><br><span>       case GSM_PCHAN_CCCH:</span><br><span style="color: hsl(0, 100%, 40%);">-            cbits = 0x10;</span><br><span style="color: hsl(120, 100%, 40%);">+         cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH;</span><br><span>                 break;</span><br><span>       case GSM_PCHAN_NONE:</span><br><span>                 LOGP(DRSL, LOGL_ERROR, "Physical channel %s not expected!\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24436">change 24436</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/c/osmo-bts/+/24436"/><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-Change-Id: I2b1480d3c330951cccc15333450cf7243b9505fc </div>
<div style="display:none"> Gerrit-Change-Number: 24436 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>