<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25894">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: s/repeated_acch_capability/rep_acch_cap/g<br><br>Shorter symbol names are easier to read.<br><br>Change-Id: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07<br>Related: SYS#5114<br>---<br>M include/osmo-bts/lchan.h<br>M src/common/l1sap.c<br>M src/common/lchan.c<br>M src/common/measurement.c<br>M src/common/rsl.c<br>M src/common/vty.c<br>6 files changed, 23 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h</span><br><span>index ccc6760..03b3144 100644</span><br><span>--- a/include/osmo-bts/lchan.h</span><br><span>+++ b/include/osmo-bts/lchan.h</span><br><span>@@ -304,7 +304,7 @@</span><br><span> /* ECU (Error Concealment Unit) state */</span><br><span> struct osmo_ecu_state *ecu_state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_rsl_osmo_rep_acch_cap rep_acch_cap;</span><br><span> bool repeated_dl_facch_active;</span><br><span> bool repeated_ul_sacch_active;</span><br><span> bool repeated_dl_sacch_active;</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index a6cd21d..cbe43b4 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1006,7 +1006,7 @@</span><br><span> * If the MS explicitly indicated that repeated ACCH is</span><br><span> * supported, than all FACCH frames may be repeated</span><br><span> * see also: 3GPP TS 44.006, section 10.3). */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(lchan->repeated_acch_capability.dl_facch_all || msg->data[0] & 0x02))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(lchan->rep_acch_cap.dl_facch_all || msg->data[0] & 0x02))</span><br><span> return msg;</span><br><span> </span><br><span> /* ... and store the message buffer for repetition. */</span><br><span>@@ -1147,7 +1147,7 @@</span><br><span> p[0] |= 0x40; /* See also: 3GPP TS 44.004, section 7.1 */</span><br><span> p[1] = lchan->ta_ctrl.current;</span><br><span> le = &lchan->lapdm_ch.lapdm_acch;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.dl_sacch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.dl_sacch) {</span><br><span> /* Check if MS requests SACCH repetition and update state accordingly */</span><br><span> if (lchan->meas.l1_info.srr_sro) {</span><br><span> if (lchan->repeated_dl_sacch_active == false)</span><br><span>@@ -1433,13 +1433,13 @@</span><br><span> * there are no uplink SACCH repetition capabilities present.</span><br><span> * However If the repeated UL-SACCH capabilities vanish for whatever</span><br><span> * reason, we must be sure that UL-SACCH repetition is disabled. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan->repeated_acch_capability.ul_sacch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lchan->rep_acch_cap.ul_sacch) {</span><br><span> lchan->repeated_ul_sacch_active = false;</span><br><span> goto out;</span><br><span> }</span><br><span> </span><br><span> /* Threshold disabled (repetition is always on) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.rxqual == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.rxqual == 0) {</span><br><span> lchan->repeated_ul_sacch_active = true;</span><br><span> goto out;</span><br><span> }</span><br><span>@@ -1454,8 +1454,8 @@</span><br><span> * of the table in GSM 05.08, section 8.2.4. The lower vector is just</span><br><span> * the upper vector shifted by 2. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- upper = ber10k_by_rxqual_upper[lchan->repeated_acch_capability.rxqual];</span><br><span style="color: hsl(0, 100%, 40%);">- lower = ber10k_by_rxqual_lower[lchan->repeated_acch_capability.rxqual];</span><br><span style="color: hsl(120, 100%, 40%);">+ upper = ber10k_by_rxqual_upper[lchan->rep_acch_cap.rxqual];</span><br><span style="color: hsl(120, 100%, 40%);">+ lower = ber10k_by_rxqual_lower[lchan->rep_acch_cap.rxqual];</span><br><span> </span><br><span> /* If upper/rxqual == 0, then repeated UL-SACCH is always on */</span><br><span> if (ber10k >= upper)</span><br><span>diff --git a/src/common/lchan.c b/src/common/lchan.c</span><br><span>index e532615..9661010 100644</span><br><span>--- a/src/common/lchan.c</span><br><span>+++ b/src/common/lchan.c</span><br><span>@@ -67,7 +67,7 @@</span><br><span> t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms;</span><br><span> t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) {</span><br><span> t200_ms_acch[DL_SAPI0] *= 2;</span><br><span> t200_ms_acch[DL_SAPI3] *= 2;</span><br><span> }</span><br><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 626f3b1..ec06131 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -804,14 +804,14 @@</span><br><span> * there are no FACCH repetition capabilities present. However If the</span><br><span> * repeated FACCH capabilities vanish for whatever reason, we must be</span><br><span> * sure that FACCH repetition is disabled. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan->repeated_acch_capability.dl_facch_cmd</span><br><span style="color: hsl(0, 100%, 40%);">- && !lchan->repeated_acch_capability.dl_facch_all) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lchan->rep_acch_cap.dl_facch_cmd</span><br><span style="color: hsl(120, 100%, 40%);">+ && !lchan->rep_acch_cap.dl_facch_all) {</span><br><span> lchan->repeated_dl_facch_active = false;</span><br><span> goto out;</span><br><span> }</span><br><span> </span><br><span> /* Threshold disabled (always on) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.rxqual == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.rxqual == 0) {</span><br><span> lchan->repeated_dl_facch_active = true;</span><br><span> goto out;</span><br><span> }</span><br><span>@@ -838,9 +838,9 @@</span><br><span> </span><br><span> /* If the RXQUAL level at the MS drops under a certain threshold</span><br><span> * we enable FACCH repetition. */</span><br><span style="color: hsl(0, 100%, 40%);">- upper = lchan->repeated_acch_capability.rxqual;</span><br><span style="color: hsl(120, 100%, 40%);">+ upper = lchan->rep_acch_cap.rxqual;</span><br><span> if (upper > 2)</span><br><span style="color: hsl(0, 100%, 40%);">- lower = lchan->repeated_acch_capability.rxqual - 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ lower = lchan->rep_acch_cap.rxqual - 2;</span><br><span> else</span><br><span> lower = 0;</span><br><span> </span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 11f2f86..a0afc30 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1574,16 +1574,16 @@</span><br><span> * should be communicated in the RSL CHANNEL ACTIVATION. For osmo-bts</span><br><span> * we will use a propritary IE. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memset(&lchan->repeated_acch_capability, 0, sizeof(lchan->repeated_acch_capability));</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&lchan->rep_acch_cap, 0, sizeof(lchan->rep_acch_cap));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->repeated_acch_capability)))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->rep_acch_cap)))</span><br><span> return 0;</span><br><span> </span><br><span> if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_REP))</span><br><span> return -RSL_ERR_OPT_IE_ERROR;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&lchan->repeated_acch_capability, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP),</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(lchan->repeated_acch_capability));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&lchan->rep_acch_cap, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP),</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(lchan->rep_acch_cap));</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 576835b..b894ba8 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1707,18 +1707,18 @@</span><br><span> {</span><br><span> cfg_out(vty, "ACCH repetition:%s", VTY_NEWLINE);</span><br><span> indent += 2;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.rxqual)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.rxqual)</span><br><span> cfg_out(vty, "Enable RXQUAL threshold: %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->repeated_acch_capability.rxqual, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->rep_acch_cap.rxqual, VTY_NEWLINE);</span><br><span> else</span><br><span> cfg_out(vty, "Enable RXQUAL threshold: (none, alway on)%s",</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span> cfg_out(vty, "DL-FACCH:%s", VTY_NEWLINE);</span><br><span> indent += 2;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.dl_facch_all)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.dl_facch_all)</span><br><span> cfg_out(vty, "retramsit all LAPDM block types%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (lchan->repeated_acch_capability.dl_facch_cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (lchan->rep_acch_cap.dl_facch_cmd)</span><br><span> cfg_out(vty, "retramsit only LAPDM command blocks%s",</span><br><span> VTY_NEWLINE);</span><br><span> else</span><br><span>@@ -1732,7 +1732,7 @@</span><br><span> </span><br><span> cfg_out(vty, "DL-SACCH:%s", VTY_NEWLINE);</span><br><span> indent += 2;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.ul_sacch)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.ul_sacch)</span><br><span> cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s",</span><br><span> VTY_NEWLINE);</span><br><span> else</span><br><span>@@ -1746,7 +1746,7 @@</span><br><span> </span><br><span> cfg_out(vty, "UL-SACCH:%s", VTY_NEWLINE);</span><br><span> indent += 2;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->repeated_acch_capability.dl_sacch)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rep_acch_cap.dl_sacch)</span><br><span> cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s",</span><br><span> VTY_NEWLINE);</span><br><span> else</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25894">change 25894</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/+/25894"/><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: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07 </div>
<div style="display:none"> Gerrit-Change-Number: 25894 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>