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/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20307 ) Change subject: tx_power: make trx/lchan struct pointers const where possible ...................................................................... tx_power: make trx/lchan struct pointers const where possible Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 --- M include/osmo-bts/tx_power.h M src/common/tx_power.c 2 files changed, 28 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/tx_power.h b/include/osmo-bts/tx_power.h index 4d0457b..8f68d8a 100644 --- a/include/osmo-bts/tx_power.h +++ b/include/osmo-bts/tx_power.h @@ -62,23 +62,23 @@ } ramp; }; -int get_p_max_out_mdBm(struct gsm_bts_trx *trx); +int get_p_max_out_mdBm(const struct gsm_bts_trx *trx); -int get_p_nominal_mdBm(struct gsm_bts_trx *trx); +int get_p_nominal_mdBm(const struct gsm_bts_trx *trx); -int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_target_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan); -int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm); +int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm); -int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan); -int get_p_trxout_actual_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red); -int get_p_trxout_actual_mdBm_lchan(struct gsm_lchan *lchan); +int get_p_trxout_actual_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); +int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan); int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb); void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm); -int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx); +int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx); diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 08c4236..0741429 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -43,16 +43,16 @@ } /* maximum output power of the system */ -int get_p_max_out_mdBm(struct gsm_bts_trx *trx) +int get_p_max_out_mdBm(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* Add user gain, internal and external PA gain to TRX output power */ return tpp->trx_p_max_out_mdBm + tpp->user_gain_mdB + tpp->pa.nominal_gain_mdB + tpp->user_pa.nominal_gain_mdB; } /* nominal output power, i.e. OML-reduced maximum output power */ -int get_p_nominal_mdBm(struct gsm_bts_trx *trx) +int get_p_nominal_mdBm(const struct gsm_bts_trx *trx) { /* P_max_out subtracted by OML maximum power reduction IE */ return get_p_max_out_mdBm(trx) - to_mdB(trx->max_power_red); @@ -61,21 +61,21 @@ /* calculate the target total output power required, reduced by both * OML and RSL, but ignoring the attenuation required for power ramping and * thermal management */ -int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red) +int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red) { /* Pn subtracted by RSL BS Power Recudtion (in 1 dB steps) */ return get_p_nominal_mdBm(trx) - to_mdB(bs_power_red); } -int get_p_target_mdBm_lchan(struct gsm_lchan *lchan) +int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan) { return get_p_target_mdBm(lchan->ts->trx, lchan->bs_power_red); } /* calculate the actual total output power required, taking into account the * attenuation required for power ramping but not thermal management */ -int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* P_target subtracted by ramp attenuation */ return p_target_mdBm - tpp->ramp.attenuation_mdB; @@ -83,9 +83,9 @@ /* calculate the effective total output power required, taking into account the * attenuation required for power ramping and thermal management */ -int get_p_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; /* P_target subtracted by ramp attenuation */ return p_target_mdBm - tpp->ramp.attenuation_mdB - tpp->thermal_attenuation_mdB; @@ -93,9 +93,9 @@ /* calculate effect TRX output power required, taking into account the * attenuations required for power ramping and thermal management */ -int get_p_trxout_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm) +int get_p_trxout_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int p_actual_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm; unsigned int arfcn = trx->arfcn; @@ -114,9 +114,9 @@ /* calculate target TRX output power required, ignoring the * attenuations required for power ramping but not thermal management */ -int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red) +int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int p_target_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm; unsigned int arfcn = trx->arfcn; @@ -132,7 +132,7 @@ /* internal PA input drive level is TRX output power */ return pa_drvlvl_mdBm; } -int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan) +int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan) { return get_p_trxout_target_mdBm(lchan->ts->trx, lchan->bs_power_red); } @@ -147,9 +147,9 @@ * attempting to register at the same time. Rather, grow the cell slowly in * radius than start with the full radius at once. */ -static int we_are_ramping_up(struct gsm_bts_trx *trx) +static int we_are_ramping_up(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; if (tpp->p_total_tgt_mdBm > tpp->p_total_cur_mdBm) return 1; @@ -298,9 +298,9 @@ } /* determine the initial transceiver output power at start-up time */ -int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx) +int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx) { - struct trx_power_params *tpp = &trx->power_params; + const struct trx_power_params *tpp = &trx->power_params; int pout_mdBm; /* this is the maximum initial output on the antenna connector -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 Gerrit-Change-Number: 20307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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/20200930/512d7da1/attachment.htm>