<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24338">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] gsm_data.h: introduce and use BTS_TSC macro<br><br>Change-Id: I0cf915d2d3a640aa1442cf6abe9a314261b4a64e<br>Related: SYS#5315, OS#4940<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/common/gsm_data.c<br>M src/common/l1sap.c<br>M src/common/oml.c<br>M src/osmo-bts-lc15/oml.c<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-octphy/l1_oml.c<br>M src/osmo-bts-sysmo/oml.c<br>8 files changed, 15 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index 69b18bc..3dfd5b7 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -520,6 +520,7 @@</span><br><span> enum gsm_phys_chan_config as_pchan);</span><br><span> </span><br><span> #define BSIC2BCC(bsic) ((bsic) & 0x07)</span><br><span style="color: hsl(120, 100%, 40%);">+#define BTS_TSC(bts) BSIC2BCC((bts)->bsic)</span><br><span> </span><br><span> uint8_t gsm_ts_tsc(const struct gsm_bts_trx_ts *ts);</span><br><span> </span><br><span>diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c</span><br><span>index f109722..f014acf 100644</span><br><span>--- a/src/common/gsm_data.c</span><br><span>+++ b/src/common/gsm_data.c</span><br><span>@@ -277,7 +277,7 @@</span><br><span> if (ts->tsc != -1)</span><br><span> return ts->tsc;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- return ts->trx->bts->bsic & 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ return BTS_TSC(ts->trx->bts);</span><br><span> }</span><br><span> </span><br><span> /* determine logical channel based on TRX and channel number IE */</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index b74e0d3..45abe4e 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1975,10 +1975,10 @@</span><br><span> </span><br><span> /* The PHY may not support using different TSCs */</span><br><span> if (!osmo_bts_has_feature(trx->bts->features, BTS_FEAT_MULTI_TSC)</span><br><span style="color: hsl(0, 100%, 40%);">- && cd->h0.tsc != (trx->bts->bsic & 7)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ && cd->h0.tsc != BTS_TSC(trx->bts)) {</span><br><span> LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "This PHY does not support "</span><br><span> "lchan TSC %u != BSIC-TSC %u, sending NACK\n",</span><br><span style="color: hsl(0, 100%, 40%);">- cd->h0.tsc, trx->bts->bsic & 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ cd->h0.tsc, BTS_TSC(trx->bts));</span><br><span> return -RSL_ERR_SERV_OPT_UNIMPL;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index c32260b..0bbe0a6 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -964,7 +964,7 @@</span><br><span> ts->tsc = *TLVP_VAL(&tp, NM_ATT_TSC);</span><br><span> } else {</span><br><span> /* If there is no TSC specified, use the BCC */</span><br><span style="color: hsl(0, 100%, 40%);">- ts->tsc = BSIC2BCC(bts->bsic);</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->tsc = BTS_TSC(bts);</span><br><span> }</span><br><span> LOGPFOH(DOML, LOGL_INFO, foh, "SET CHAN ATTR (TSC=%u pchan=%s",</span><br><span> ts->tsc, gsm_pchan_name(ts->pchan));</span><br><span>diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c</span><br><span>index 39d0e5e..3010fe7 100644</span><br><span>--- a/src/osmo-bts-lc15/oml.c</span><br><span>+++ b/src/osmo-bts-lc15/oml.c</span><br><span>@@ -432,7 +432,7 @@</span><br><span> dev_par->freqBand = lc15_band;</span><br><span> dev_par->u16Arfcn = trx->arfcn;</span><br><span> dev_par->u16BcchArfcn = trx->bts->c0->arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- dev_par->u8NbTsc = trx->bts->bsic & 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ dev_par->u8NbTsc = BTS_TSC(trx->bts);</span><br><span> </span><br><span> if (!trx_ms_pwr_ctrl_is_osmo(trx)) {</span><br><span> /* Target is in the middle between lower and upper RxLev thresholds */</span><br><span>@@ -1835,9 +1835,9 @@</span><br><span> * channels with a different TSC!! */</span><br><span> if (TLVP_PRESENT(new_attr, NM_ATT_TSC) &&</span><br><span> TLVP_LEN(new_attr, NM_ATT_TSC) >= 1 &&</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC) != (bts->bsic & 7)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *TLVP_VAL(new_attr, NM_ATT_TSC) != BTS_TSC(bts)) {</span><br><span> LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC), bts->bsic & 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ *TLVP_VAL(new_attr, NM_ATT_TSC), BTS_TSC(bts));</span><br><span> return -NM_NACK_PARAM_RANGE;</span><br><span> }</span><br><span> break;</span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 8fd3688..151b92e 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -447,7 +447,7 @@</span><br><span> dev_par->freqBand = oc2g_band;</span><br><span> dev_par->u16Arfcn = trx->arfcn;</span><br><span> dev_par->u16BcchArfcn = trx->bts->c0->arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- dev_par->u8NbTsc = trx->bts->bsic & 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ dev_par->u8NbTsc = BTS_TSC(trx->bts);</span><br><span> </span><br><span> if (!trx_ms_pwr_ctrl_is_osmo(trx)) {</span><br><span> /* Target is in the middle between lower and upper RxLev thresholds */</span><br><span>@@ -1844,9 +1844,9 @@</span><br><span> * channels with a different TSC!! */</span><br><span> if (TLVP_PRESENT(new_attr, NM_ATT_TSC) &&</span><br><span> TLVP_LEN(new_attr, NM_ATT_TSC) >= 1 &&</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC) != (bts->bsic & 7)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *TLVP_VAL(new_attr, NM_ATT_TSC) != BTS_TSC(bts)) {</span><br><span> LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC), bts->bsic & 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ *TLVP_VAL(new_attr, NM_ATT_TSC), BTS_TSC(bts));</span><br><span> return -NM_NACK_PARAM_RANGE;</span><br><span> }</span><br><span> break;</span><br><span>diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c</span><br><span>index b7f4935..9bd01f4 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_oml.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_oml.c</span><br><span>@@ -1352,7 +1352,7 @@</span><br><span> }</span><br><span> oc->Config.usBcchArfcn = trx->bts->c0->arfcn;</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- oc->Config.usTsc = trx->bts->bsic & 0x7;</span><br><span style="color: hsl(120, 100%, 40%);">+ oc->Config.usTsc = BTS_TSC(trx->bts);</span><br><span> oc->RfConfig.ulRxGainDb = plink->u.octphy.rx_gain_db;</span><br><span> /* FIXME: compute this based on nominal transmit power, etc. */</span><br><span> if (plink->u.octphy.tx_atten_flag) {</span><br><span>diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c</span><br><span>index ac3176c..25c5651 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml.c</span><br><span>@@ -427,7 +427,7 @@</span><br><span> dev_par->freqBand = femto_band;</span><br><span> dev_par->u16Arfcn = trx->arfcn;</span><br><span> dev_par->u16BcchArfcn = trx->bts->c0->arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- dev_par->u8NbTsc = trx->bts->bsic & 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ dev_par->u8NbTsc = BTS_TSC(trx->bts);</span><br><span> </span><br><span> if (!trx_ms_pwr_ctrl_is_osmo(trx)) {</span><br><span> /* Target is in the middle between lower and upper RxLev thresholds */</span><br><span>@@ -1748,9 +1748,9 @@</span><br><span> * one one TRX, so we need to make sure not to activate</span><br><span> * channels with a different TSC!! */</span><br><span> if (TLVP_PRES_LEN(new_attr, NM_ATT_TSC, 1) &&</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC) != (bts->bsic & 7)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *TLVP_VAL(new_attr, NM_ATT_TSC) != BTS_TSC(bts)) {</span><br><span> LOGP(DOML, LOGL_ERROR, "Channel TSC %u != BSIC-TSC %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- *TLVP_VAL(new_attr, NM_ATT_TSC), bts->bsic & 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ *TLVP_VAL(new_attr, NM_ATT_TSC), BTS_TSC(bts));</span><br><span> return -NM_NACK_PARAM_RANGE;</span><br><span> }</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24338">change 24338</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/+/24338"/><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: I0cf915d2d3a640aa1442cf6abe9a314261b4a64e </div>
<div style="display:none"> Gerrit-Change-Number: 24338 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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-MessageType: merged </div>