<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24802">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support SDCCH8 in osmo dyn ts<br><br>Change-Id: Id541dee6c224d2b8d97c07b916085883354cecbc<br>---<br>M src/common/bts.c<br>M src/common/gsm_data.c<br>M src/common/rsl.c<br>3 files changed, 19 insertions(+), 6 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/02/24802/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index bf29113..32b2fa3 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -371,6 +371,7 @@</span><br><span>  /* features implemented in 'common', available for all models */</span><br><span>     osmo_bts_set_feature(bts->features, BTS_FEAT_ETWS_PN);</span><br><span>    osmo_bts_set_feature(bts->features, BTS_FEAT_IPV6_NSVC);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_bts_set_feature(bts->features, BTS_FEAT_DYN_TS_SDCCH8);</span><br><span> </span><br><span>  rc = bts_model_init(bts);</span><br><span>    if (rc < 0) {</span><br><span>diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c</span><br><span>index ec6cf93..2b2a180 100644</span><br><span>--- a/src/common/gsm_data.c</span><br><span>+++ b/src/common/gsm_data.c</span><br><span>@@ -382,7 +382,8 @@</span><br><span>      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 style="color: hsl(0, 100%, 40%);">-             ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C_CBCH)</span><br><span style="color: hsl(120, 100%, 40%);">+                ts->pchan != GSM_PCHAN_SDCCH8_SACCH8C_CBCH &&</span><br><span style="color: hsl(120, 100%, 40%);">+              ts->pchan != GSM_PCHAN_TCH_F_TCH_H_SDCCH8_SACCH8C_PDCH)</span><br><span>                       ok = false;</span><br><span>          break;</span><br><span>       case ABIS_RSL_CHAN_NR_CBITS_BCCH:</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index d922174..0f15be4 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1425,6 +1425,7 @@</span><br><span>       switch (ts->dyn.pchan_want) {</span><br><span>     case GSM_PCHAN_TCH_F:</span><br><span>        case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span>               break;</span><br><span>       case GSM_PCHAN_PDCH:</span><br><span>                 /* Only the first lchan matters for PDCH */</span><br><span>@@ -1448,14 +1449,23 @@</span><br><span> </span><br><span> static enum gsm_phys_chan_config dyn_pchan_from_chan_nr(uint8_t chan_nr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      uint8_t cbits = chan_nr & RSL_CHAN_NR_MASK;</span><br><span style="color: hsl(120, 100%, 40%);">+       uint8_t cbits = chan_nr >> 3;</span><br><span>  switch (cbits) {</span><br><span style="color: hsl(0, 100%, 40%);">-        case RSL_CHAN_Bm_ACCHs:</span><br><span style="color: hsl(120, 100%, 40%);">+       case ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs:</span><br><span>                return GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- case RSL_CHAN_Lm_ACCHs:</span><br><span style="color: hsl(0, 100%, 40%);">- case (RSL_CHAN_Lm_ACCHs + RSL_CHAN_NR_1):</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>             return GSM_PCHAN_TCH_H;</span><br><span style="color: hsl(0, 100%, 40%);">- case RSL_CHAN_OSMO_PDCH:</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 style="color: hsl(120, 100%, 40%);">+           return GSM_PCHAN_SDCCH8_SACCH8C;</span><br><span style="color: hsl(120, 100%, 40%);">+      case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH:</span><br><span>               return GSM_PCHAN_PDCH;</span><br><span>       default:</span><br><span>             LOGP(DRSL, LOGL_ERROR,</span><br><span>@@ -2982,6 +2992,7 @@</span><br><span>       switch (ts->dyn.pchan_want) {</span><br><span>     case GSM_PCHAN_TCH_F:</span><br><span>        case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span>       case GSM_PCHAN_PDCH:</span><br><span>                 break;</span><br><span>       default:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24802">change 24802</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/+/24802"/><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: Id541dee6c224d2b8d97c07b916085883354cecbc </div>
<div style="display:none"> Gerrit-Change-Number: 24802 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>