fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32538 )

Change subject: struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red ......................................................................

struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red

Change-Id: I13d9e6ea2a2b7b11f92532d377e71f0e83974622 Related: SYS#6435 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_osmobts.c 3 files changed, 15 insertions(+), 6 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/32538/1

diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 20ed089..9b2aaab 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -300,7 +300,7 @@ /* (Optional) function for sending default MS/BS Power Control paramaters */ int (*power_ctrl_send_def_params)(const struct gsm_bts_trx *trx); /* (Optional) function for toggling BCCH carrier power reduction operation */ - int (*power_ctrl_set_c0_power_red)(const struct gsm_bts *bts, const uint8_t red); + int (*power_ctrl_send_c0_power_red)(const struct gsm_bts *bts, const uint8_t red);

void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 527220f..f5936c7 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -986,10 +986,10 @@

if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) return -ENOTSUP; - if (bts->model->power_ctrl_set_c0_power_red == NULL) + if (bts->model->power_ctrl_send_c0_power_red == NULL) return -ENOTSUP;

- rc = bts->model->power_ctrl_set_c0_power_red(bts, red); + rc = bts->model->power_ctrl_send_c0_power_red(bts, red); if (rc != 0) return rc;

diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 078cfe7..5f6f86f 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -159,8 +159,7 @@ *ie_len = msg->tail - (ie_len + 1); }

-static int power_ctrl_set_c0_power_red(const struct gsm_bts *bts, - const uint8_t red) +static int power_ctrl_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg; @@ -198,7 +197,7 @@ model_osmobts.force_combined_si = false;

/* Power control API */ - model_osmobts.power_ctrl_set_c0_power_red = &power_ctrl_set_c0_power_red; + model_osmobts.power_ctrl_send_c0_power_red = &power_ctrl_send_c0_power_red;

model_osmobts.features.data = &model_osmobts._features_data[0]; model_osmobts.features.data_len =