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