diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-11-13 12:51:17 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-11-14 16:36:00 +0100 |
| commit | e5e122630102f5197357b6afef3de0e73d372f4c (patch) | |
| tree | 16fa2271afcd0ac8c1b6bf2a0e6ef4fc1672bb9e | |
| parent | d8d459c7e2d5fded700d5bb708a45187eb6d094f (diff) | |
Change gsm_bts_trx field to bool and rename it
Thies field is used to store and retrieve whether MS power needs to be
calculated and updated by osmo-bts software or autonomously by lower
layers. Previous name was not clear
and may have been understood as indicating whether MS Power Control loop
is done or not in general, and the responsible for that is located under
lchan's ms_power_ctrl.fixed.
Related: OS#1851
Change-Id: Ic690ab69866a7377f1597e24aa7b0214831c1cbe
| -rw-r--r-- | include/osmo-bts/bts.h | 2 | ||||
| -rw-r--r-- | include/osmo-bts/gsm_data_shared.h | 2 | ||||
| -rw-r--r-- | src/common/bts.c | 4 | ||||
| -rw-r--r-- | src/common/vty.c | 4 | ||||
| -rw-r--r-- | tests/power/power_test.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 5c719f98..63412f9b 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -49,7 +49,7 @@ void load_timer_start(struct gsm_bts *bts); uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg); void bts_update_status(enum bts_global_status which, int on); -int trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx); +bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx); struct gsm_time *get_time(struct gsm_bts *bts); diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 1445ed2b..8678ea53 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -417,7 +417,7 @@ struct gsm_bts_trx { struct trx_power_params power_params; - int ms_power_control; + bool ms_pwr_ctl_soft; /* is power control loop done by osmocom software? */ struct { void *l1h; diff --git a/src/common/bts.c b/src/common/bts.c index 60e27cc8..3809eb3e 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -778,9 +778,9 @@ int bts_supports_cipher(struct gsm_bts *bts, int rsl_cipher) return sup > 0; } -int trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx) +bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx) { - return trx->ms_power_control == 1; + return trx->ms_pwr_ctl_soft; } struct gsm_time *get_time(struct gsm_bts *bts) diff --git a/src/common/vty.c b/src/common/vty.c index e775d999..fd9be40c 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -332,7 +332,7 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) vty_out(vty, " power-ramp step-interval %d%s", tpp->ramp.step_interval_sec, VTY_NEWLINE); vty_out(vty, " ms-power-control %s%s", - trx->ms_power_control == 0 ? "dsp" : "osmo", + trx->ms_pwr_ctl_soft ? "osmo" : "dsp", VTY_NEWLINE); vty_out(vty, " phy %u instance %u%s", pinst->phy_link->num, pinst->num, VTY_NEWLINE); @@ -790,7 +790,7 @@ DEFUN(cfg_trx_ms_power_control, cfg_trx_ms_power_control_cmd, { struct gsm_bts_trx *trx = vty->index; - trx->ms_power_control = argv[0][0] == 'd' ? 0 : 1; + trx->ms_pwr_ctl_soft = !strcmp(argv[0], "osmo"); return CMD_SUCCESS; } diff --git a/tests/power/power_test.c b/tests/power/power_test.c index a46a430c..8df6d693 100644 --- a/tests/power/power_test.c +++ b/tests/power/power_test.c @@ -48,7 +48,7 @@ static void test_power_loop(void) ts.trx = &trx; trx.bts = &bts; bts.band = GSM_BAND_1800; - trx.ms_power_control = 1; + trx.ms_pwr_ctl_soft = true; bts.ul_power_target = -75; lchan->state = LCHAN_S_NONE; |