diff options
author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2021-11-14 20:59:21 +0300 |
---|---|---|
committer | fixeria <vyanitskiy@sysmocom.de> | 2021-11-15 11:59:03 +0000 |
commit | c8bd1eeaca5973388f54488cadb7190b52770a53 (patch) | |
tree | 804dd8154d1251d7b214d0b9194d5247aad64f92 | |
parent | ff1328a0386b6ab9a6423be9bc8bc59670e5ac59 (diff) |
struct gsm_bts: s/repeated_acch_policy/rep_acch_cap/g
Let's have a short and consistent naming for both ACCH repetition
and temporary ACCH overpower structures, like it's done in osmo-bts.
Change-Id: Ia12c83ad1af4744ce28ba655ac806784f746e88a
Related: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07
-rw-r--r-- | include/osmocom/bsc/bts.h | 2 | ||||
-rw-r--r-- | src/osmo-bsc/abis_rsl.c | 2 | ||||
-rw-r--r-- | src/osmo-bsc/bts.c | 2 | ||||
-rw-r--r-- | src/osmo-bsc/bts_vty.c | 38 |
4 files changed, 22 insertions, 22 deletions
diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index b42c4ffd8..31f14a195 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -591,7 +591,7 @@ struct gsm_bts { struct llist_head chan_rqd_queue; /* ACCH Repetition capabilities */ - struct abis_rsl_osmo_rep_acch_cap repeated_acch_policy; + struct abis_rsl_osmo_rep_acch_cap rep_acch_cap; /* ACCH Temporary overpower capabilities */ struct abis_rsl_osmo_temp_ovp_acch_cap temporary_overpower; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index d596fdd14..0e3809e7a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -540,7 +540,7 @@ static void rep_acch_cap_for_bts(struct gsm_lchan *lchan, cap = (struct abis_rsl_osmo_rep_acch_cap*) msg->tail; msgb_tlv_put(msg, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(*cap), - (uint8_t *)&bts->repeated_acch_policy); + (uint8_t *)&bts->rep_acch_cap); if (!(lchan->conn && lchan->conn->cm3_valid && lchan->conn->cm3.repeated_acch_capability)) { diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 71cf4da89..f1cb44163 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -398,7 +398,7 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm acc_ramp_init(&bts->acc_ramp, bts); /* Default RxQual threshold for ACCH repetition/overpower */ - bts->repeated_acch_policy.rxqual = 4; + bts->rep_acch_cap.rxqual = 4; bts->temporary_overpower.rxqual = 4; /* MS Power Control parameters (defaults) */ diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 1306a03f9..ddc57853d 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -650,11 +650,11 @@ DEFUN_USRATTR(cfg_bts_rep_dl_facch, } if (!strcmp(argv[0], "command")) { - bts->repeated_acch_policy.dl_facch_cmd = true; - bts->repeated_acch_policy.dl_facch_all = false; + bts->rep_acch_cap.dl_facch_cmd = true; + bts->rep_acch_cap.dl_facch_all = false; } else { - bts->repeated_acch_policy.dl_facch_cmd = true; - bts->repeated_acch_policy.dl_facch_all = true; + bts->rep_acch_cap.dl_facch_cmd = true; + bts->rep_acch_cap.dl_facch_all = true; } return CMD_SUCCESS; } @@ -668,8 +668,8 @@ DEFUN_USRATTR(cfg_bts_rep_no_dl_facch, { struct gsm_bts *bts = vty->index; - bts->repeated_acch_policy.dl_facch_cmd = false; - bts->repeated_acch_policy.dl_facch_all = false; + bts->rep_acch_cap.dl_facch_cmd = false; + bts->rep_acch_cap.dl_facch_all = false; return CMD_SUCCESS; } @@ -691,9 +691,9 @@ DEFUN_USRATTR(cfg_bts_rep_ul_dl_sacch, } if (strcmp(argv[0], "ul-sacch") == 0) - bts->repeated_acch_policy.ul_sacch = true; + bts->rep_acch_cap.ul_sacch = true; else - bts->repeated_acch_policy.dl_sacch = true; + bts->rep_acch_cap.dl_sacch = true; return CMD_SUCCESS; } @@ -709,9 +709,9 @@ DEFUN_USRATTR(cfg_bts_rep_no_ul_dl_sacch, struct gsm_bts *bts = vty->index; if (strcmp(argv[0], "ul-sacch") == 0) - bts->repeated_acch_policy.ul_sacch = false; + bts->rep_acch_cap.ul_sacch = false; else - bts->repeated_acch_policy.dl_sacch = false; + bts->rep_acch_cap.dl_sacch = false; return CMD_SUCCESS; } @@ -745,7 +745,7 @@ DEFUN_USRATTR(cfg_bts_rep_rxqual, } /* See also: GSM 05.08, section 8.2.4 */ - bts->repeated_acch_policy.rxqual = atoi(argv[0]); + bts->rep_acch_cap.rxqual = atoi(argv[0]); return CMD_SUCCESS; } @@ -4313,18 +4313,18 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) top->rxqual, VTY_NEWLINE); } - if (bts->repeated_acch_policy.dl_facch_all) + if (bts->rep_acch_cap.dl_facch_all) vty_out(vty, " repeat dl-facch all%s", VTY_NEWLINE); - else if (bts->repeated_acch_policy.dl_facch_cmd) + else if (bts->rep_acch_cap.dl_facch_cmd) vty_out(vty, " repeat dl-facch command%s", VTY_NEWLINE); - if (bts->repeated_acch_policy.dl_sacch) + if (bts->rep_acch_cap.dl_sacch) vty_out(vty, " repeat dl-sacch%s", VTY_NEWLINE); - if (bts->repeated_acch_policy.ul_sacch) + if (bts->rep_acch_cap.ul_sacch) vty_out(vty, " repeat ul-sacch%s", VTY_NEWLINE); - if (bts->repeated_acch_policy.ul_sacch - || bts->repeated_acch_policy.dl_facch_cmd - || bts->repeated_acch_policy.dl_facch_cmd) - vty_out(vty, " repeat rxqual %u%s", bts->repeated_acch_policy.rxqual, VTY_NEWLINE); + if (bts->rep_acch_cap.ul_sacch + || bts->rep_acch_cap.dl_facch_cmd + || bts->rep_acch_cap.dl_facch_cmd) + vty_out(vty, " repeat rxqual %u%s", bts->rep_acch_cap.rxqual, VTY_NEWLINE); if (bts->interf_meas_params_cfg.avg_period != interf_meas_params_def.avg_period) { vty_out(vty, " interference-meas avg-period %u%s", |