<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20307">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tx_power: make trx/lchan struct pointers const where possible<br><br>Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2<br>---<br>M include/osmo-bts/tx_power.h<br>M src/common/tx_power.c<br>2 files changed, 28 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/20307/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/tx_power.h b/include/osmo-bts/tx_power.h</span><br><span>index 4d0457b..8f68d8a 100644</span><br><span>--- a/include/osmo-bts/tx_power.h</span><br><span>+++ b/include/osmo-bts/tx_power.h</span><br><span>@@ -62,23 +62,23 @@</span><br><span> } ramp;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_max_out_mdBm(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_max_out_mdBm(const struct gsm_bts_trx *trx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_nominal_mdBm(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_nominal_mdBm(const struct gsm_bts_trx *trx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red);</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_target_mdBm_lchan(struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red);</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_trxout_actual_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red);</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_trxout_actual_mdBm_lchan(struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_trxout_actual_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red);</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan);</span><br><span> </span><br><span> int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb);</span><br><span> </span><br><span> void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx);</span><br><span>diff --git a/src/common/tx_power.c b/src/common/tx_power.c</span><br><span>index 08c4236..0741429 100644</span><br><span>--- a/src/common/tx_power.c</span><br><span>+++ b/src/common/tx_power.c</span><br><span>@@ -43,16 +43,16 @@</span><br><span> }</span><br><span> </span><br><span> /* maximum output power of the system */</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_max_out_mdBm(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_max_out_mdBm(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct trx_power_params *tpp = &trx->power_params;</span><br><span> /* Add user gain, internal and external PA gain to TRX output power */</span><br><span> return tpp->trx_p_max_out_mdBm + tpp->user_gain_mdB +</span><br><span> tpp->pa.nominal_gain_mdB + tpp->user_pa.nominal_gain_mdB;</span><br><span> }</span><br><span> </span><br><span> /* nominal output power, i.e. OML-reduced maximum output power */</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_nominal_mdBm(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_nominal_mdBm(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span> /* P_max_out subtracted by OML maximum power reduction IE */</span><br><span> return get_p_max_out_mdBm(trx) - to_mdB(trx->max_power_red);</span><br><span>@@ -61,21 +61,21 @@</span><br><span> /* calculate the target total output power required, reduced by both</span><br><span> * OML and RSL, but ignoring the attenuation required for power ramping and</span><br><span> * thermal management */</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red)</span><br><span> {</span><br><span> /* Pn subtracted by RSL BS Power Recudtion (in 1 dB steps) */</span><br><span> return get_p_nominal_mdBm(trx) - to_mdB(bs_power_red);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_target_mdBm_lchan(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_target_mdBm_lchan(const struct gsm_lchan *lchan)</span><br><span> {</span><br><span> return get_p_target_mdBm(lchan->ts->trx, lchan->bs_power_red);</span><br><span> }</span><br><span> </span><br><span> /* calculate the actual total output power required, taking into account the</span><br><span> * attenuation required for power ramping but not thermal management */</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_actual_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_actual_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct trx_power_params *tpp = &trx->power_params;</span><br><span> </span><br><span> /* P_target subtracted by ramp attenuation */</span><br><span> return p_target_mdBm - tpp->ramp.attenuation_mdB;</span><br><span>@@ -83,9 +83,9 @@</span><br><span> </span><br><span> /* calculate the effective total output power required, taking into account the</span><br><span> * attenuation required for power ramping and thermal management */</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct trx_power_params *tpp = &trx->power_params;</span><br><span> </span><br><span> /* P_target subtracted by ramp attenuation */</span><br><span> return p_target_mdBm - tpp->ramp.attenuation_mdB - tpp->thermal_attenuation_mdB;</span><br><span>@@ -93,9 +93,9 @@</span><br><span> </span><br><span> /* calculate effect TRX output power required, taking into account the</span><br><span> * attenuations required for power ramping and thermal management */</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_trxout_eff_mdBm(struct gsm_bts_trx *trx, int p_target_mdBm)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_trxout_eff_mdBm(const struct gsm_bts_trx *trx, int p_target_mdBm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct trx_power_params *tpp = &trx->power_params;</span><br><span> int p_actual_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm;</span><br><span> unsigned int arfcn = trx->arfcn;</span><br><span> </span><br><span>@@ -114,9 +114,9 @@</span><br><span> </span><br><span> /* calculate target TRX output power required, ignoring the</span><br><span> * attenuations required for power ramping but not thermal management */</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_trxout_target_mdBm(struct gsm_bts_trx *trx, uint8_t bs_power_red)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_trxout_target_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct trx_power_params *tpp = &trx->power_params;</span><br><span> int p_target_mdBm, user_pa_drvlvl_mdBm, pa_drvlvl_mdBm;</span><br><span> unsigned int arfcn = trx->arfcn;</span><br><span> </span><br><span>@@ -132,7 +132,7 @@</span><br><span> /* internal PA input drive level is TRX output power */</span><br><span> return pa_drvlvl_mdBm;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-int get_p_trxout_target_mdBm_lchan(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+int get_p_trxout_target_mdBm_lchan(const struct gsm_lchan *lchan)</span><br><span> {</span><br><span> return get_p_trxout_target_mdBm(lchan->ts->trx, lchan->bs_power_red);</span><br><span> }</span><br><span>@@ -147,9 +147,9 @@</span><br><span> * attempting to register at the same time. Rather, grow the cell slowly in</span><br><span> * radius than start with the full radius at once. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int we_are_ramping_up(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+static int we_are_ramping_up(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct trx_power_params *tpp = &trx->power_params;</span><br><span> </span><br><span> if (tpp->p_total_tgt_mdBm > tpp->p_total_cur_mdBm)</span><br><span> return 1;</span><br><span>@@ -298,9 +298,9 @@</span><br><span> }</span><br><span> </span><br><span> /* determine the initial transceiver output power at start-up time */</span><br><span style="color: hsl(0, 100%, 40%);">-int power_ramp_initial_power_mdBm(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct trx_power_params *tpp = &trx->power_params;</span><br><span> int pout_mdBm;</span><br><span> </span><br><span> /* this is the maximum initial output on the antenna connector</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20307">change 20307</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/20307"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1b290af115730ba16f4f9887fe316e2ed15659a2 </div>
<div style="display:none"> Gerrit-Change-Number: 20307 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>