cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

power_control: clarify argument names of lchan_ms_pwr_ctrl() 

Change-Id: I821120bf5c3690f5b4c6b96c879e675b3d271c90
This commit is contained in:
Vadim Yanitskiy 2020-10-10 23:32:51 +07:00
parent 52d6e43d0e
commit 8d62d66ed5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osmo-bts/power_control.h
View File

@ -4,4 +4,5 @@
#include <osmo-bts/gsm_data.h> #include <osmo-bts/gsm_data.h>
int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
const uint8_t ms_power, const int rxLevel); const uint8_t ms_power_lvl,
const int8_t ul_rssi_dbm);

11
src/common/power_control.c
View File

@ -39,10 +39,11 @@
/*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan.
* \param lchan logical channel for which to compute (and in which to store) new power value. * \param lchan logical channel for which to compute (and in which to store) new power value.
* \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH Header in SACCH block. * \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH Header in SACCH block.
* \param[in] rxLevel Signal level of the received SACCH block, in dBm. * \param[in] ul_rssi_dbm Signal level of the received SACCH block, in dBm.
*/ */
int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
const uint8_t ms_power_lvl, const int rxLevel) const uint8_t ms_power_lvl,
const int8_t ul_rssi_dbm)
{ {
int diff; int diff;
struct gsm_bts_trx *trx = lchan->ts->trx; struct gsm_bts_trx *trx = lchan->ts->trx;
@ -73,7 +74,7 @@ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
/* How many dBs measured power should be increased (+) or decreased (-) /* How many dBs measured power should be increased (+) or decreased (-)
to reach expected power. */ to reach expected power. */
diff = bts->ul_power_target - rxLevel; diff = bts->ul_power_target - ul_rssi_dbm;
/* don't ever change more than MS_{LOWER,RAISE}_MAX_DBM during one loop /* don't ever change more than MS_{LOWER,RAISE}_MAX_DBM during one loop
iteration, i.e. reduce the speed at which the MS transmit power can iteration, i.e. reduce the speed at which the MS transmit power can
@ -107,7 +108,7 @@ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
"(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n",
new_power_lvl, new_dbm, new_power_lvl, new_dbm,
ms_power_lvl, lchan->ms_power_ctrl.max, ms_power_lvl, lchan->ms_power_ctrl.max,
rxLevel, bts->ul_power_target); ul_rssi_dbm, bts->ul_power_target);
return 0; return 0;
} }
@ -117,7 +118,7 @@ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
(new_dbm > current_dbm) ? "Raising" : "Lowering", (new_dbm > current_dbm) ? "Raising" : "Lowering",
lchan->ms_power_ctrl.current, current_dbm, new_power_lvl, new_dbm, lchan->ms_power_ctrl.current, current_dbm, new_power_lvl, new_dbm,
ms_power_lvl, lchan->ms_power_ctrl.max, ms_power_lvl, lchan->ms_power_ctrl.max,
rxLevel, bts->ul_power_target); ul_rssi_dbm, bts->ul_power_target);
/* store the resulting new MS power level in the lchan */ /* store the resulting new MS power level in the lchan */
lchan->ms_power_ctrl.current = new_power_lvl; lchan->ms_power_ctrl.current = new_power_lvl;