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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl_lchan_lookup(): turn cbits if-cascade into a switch()<br><br>There is some odd repetition of macros with all possible subslot<br>indexes, but now we are using the defined macros instead of magic<br>numbers, making it easier to see that it is correct.<br><br>Also this allows trivially adding VAMOS cbits cases to the existing<br>switch() in a subsequent patch.<br><br>Change-Id: I4c6ce2f4ca999c19a58909b9adb849a3b8b6ffc8<br>---<br>M src/osmo-bsc/bts_trx.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/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index 1f3cb0a..8d47ba5 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -156,28 +156,49 @@</span><br><span>        if (rc)</span><br><span>              *rc = -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      if (cbits == 0x01) {</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>          ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_F)</span><br><span>                     || ts->pchan_on_init == GSM_PCHAN_PDCH; /* PDCH? really? */</span><br><span style="color: hsl(0, 100%, 40%);">-  } else if ((cbits & 0x1e) == 0x02) {</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>          ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_TCH_H);</span><br><span style="color: hsl(0, 100%, 40%);">-       } else if ((cbits & 0x1c) == 0x04) {</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>                ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH_SDCCH4);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if ((cbits & 0x18) == 0x08) {</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>                ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_SDCCH8_SACCH8C);</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; /* CCCH? */</span><br><span>             ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_CCCH);</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>                 ok = (ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH);</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-bsc/+/24428">change 24428</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-bsc/+/24428"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4c6ce2f4ca999c19a58909b9adb849a3b8b6ffc8 </div>
<div style="display:none"> Gerrit-Change-Number: 24428 </div>
<div style="display:none"> Gerrit-PatchSet: 16 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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>