<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24438">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] rsl_lchan_lookup(): make it more readable<br><br>Change-Id: I3160929c739a521fe494716c3da3d3b72370a98a<br>Related: SYS#4895, OS#4941<br>---<br>M src/common/gsm_data.c<br>1 file changed, 28 insertions(+), 7 deletions(-)<br><br></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 8425d1a..6b57851 100644</span><br><span>--- a/src/common/gsm_data.c</span><br><span>+++ b/src/common/gsm_data.c</span><br><span>@@ -282,41 +282,62 @@</span><br><span>      if (rc)</span><br><span>              *rc = -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      if (cbits == ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs) {</span><br><span style="color: hsl(120, 100%, 40%);">+       switch (cbits) {</span><br><span style="color: hsl(120, 100%, 40%);">+      case ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs:</span><br><span>                lch_idx = 0;    /* TCH/F */</span><br><span>          if (ts->pchan != GSM_PCHAN_TCH_F &&</span><br><span>                   ts->pchan != GSM_PCHAN_PDCH &&</span><br><span>                    ts->pchan != GSM_PCHAN_TCH_F_PDCH &&</span><br><span>              ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span>                      ok = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     } else if ((cbits & 0x1e) == ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(0):</span><br><span style="color: hsl(120, 100%, 40%);">+      case ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(1):</span><br><span>             lch_idx = cbits & 0x1;      /* TCH/H */</span><br><span>          if (ts->pchan != GSM_PCHAN_TCH_H &&</span><br><span>                   ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span>                      ok = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     } else if ((cbits & 0x1c) == ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(1):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(2):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(3):</span><br><span>          lch_idx = cbits & 0x3;      /* SDCCH/4 */</span><br><span>                if (ts->pchan != GSM_PCHAN_CCCH_SDCCH4 &&</span><br><span>                     ts->pchan != GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span>                      ok = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     } else if ((cbits & 0x18) == ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(0):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(1):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(2):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(3):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(4):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(5):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(6):</span><br><span style="color: hsl(120, 100%, 40%);">+   case ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(7):</span><br><span>          lch_idx = cbits & 0x7;      /* SDCCH/8 */</span><br><span>                if (ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C &&</span><br><span>                  ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C_CBCH)</span><br><span>                   ok = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     } else if (cbits == 0x10 || cbits == 0x11 || cbits == 0x12) {</span><br><span style="color: hsl(120, 100%, 40%);">+         break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case ABIS_RSL_CHAN_NR_CBITS_BCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+     case ABIS_RSL_CHAN_NR_CBITS_RACH:</span><br><span style="color: hsl(120, 100%, 40%);">+     case ABIS_RSL_CHAN_NR_CBITS_PCH_AGCH:</span><br><span>                lch_idx = 0;</span><br><span>                 if (ts->pchan != GSM_PCHAN_CCCH &&</span><br><span>                    ts->pchan != GSM_PCHAN_CCCH_SDCCH4 &&</span><br><span>                     ts->pchan != GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span>                      ok = false;</span><br><span>          /* FIXME: we should not return first sdcch4 !!! */</span><br><span style="color: hsl(0, 100%, 40%);">-      } else if ((chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_OSMO_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+          break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH:</span><br><span>               lch_idx = 0;</span><br><span>                 if (ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span>                      ok = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     } else</span><br><span style="color: hsl(120, 100%, 40%);">+                break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span>             return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span> </span><br><span>        if (rc && ok)</span><br><span>                *rc = 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24438">change 24438</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/+/24438"/><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: I3160929c739a521fe494716c3da3d3b72370a98a </div>
<div style="display:none"> Gerrit-Change-Number: 24438 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>