diff options
| author | Max <msuraev@sysmocom.de> | 2017-08-24 15:35:54 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-08-24 19:06:48 +0000 |
| commit | aa11997480822af0a583ac3c7c3fca1dc4bbe994 (patch) | |
| tree | 1af4bc75664d14d65ecb72b186aa18f1358a0799 /src/osmo-bts-trx/loops.c | |
| parent | 9a30b7781310b81555b216d32b172b6bb9c9d7e4 (diff) | |
osmo-bts-trx: remove global variables from loops
* move TA related globals into phy_link
* move power loop related globals into phy_link
* prefix corresponding vty vars with osmotrx
Change-Id: I01d7c1abad67e51b886a4ecf2de072929d67da27
Related: OS#1848
Diffstat (limited to 'src/osmo-bts-trx/loops.c')
| -rw-r--r-- | src/osmo-bts-trx/loops.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index 3da805ce..6f87cd1f 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -39,9 +39,6 @@ * MS Power loop */ -int trx_ms_power_loop = 0; -int8_t trx_target_rssi = -10; - static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; @@ -118,6 +115,7 @@ static int ms_power_clock(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { struct gsm_bts_trx *trx = lchan->ts->trx; + struct phy_instance *pinst = trx_phy_instance(trx); int rssi; int i; @@ -159,10 +157,10 @@ static int ms_power_clock(struct gsm_lchan *lchan, /* change RSSI */ LOGP(DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current " "MS power: %d (%d dBm) of trx=%u chan_nr=0x%02x\n", rssi, - trx_target_rssi, lchan->ms_power_ctrl.current, + pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current, MS_PWR_DBM(trx->arfcn, lchan->ms_power_ctrl.current), trx->nr, chan_nr); - ms_power_diff(lchan, chan_nr, trx_target_rssi - rssi); + ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); return 0; } @@ -172,8 +170,6 @@ static int ms_power_clock(struct gsm_lchan *lchan, * Timing Advance loop */ -int trx_ta_loop = 1; - int ta_val(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state, float toa) { @@ -220,11 +216,12 @@ int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, { struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] .lchan[l1sap_chan2ss(chan_nr)]; + struct phy_instance *pinst = trx_phy_instance(l1t->trx); - if (trx_ms_power_loop) + if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) ms_power_val(chan_state, rssi); - if (trx_ta_loop) + if (pinst->phy_link->u.osmotrx.trx_ta_loop) ta_val(lchan, chan_nr, chan_state, toa); return 0; @@ -235,8 +232,9 @@ int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, { struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] .lchan[l1sap_chan2ss(chan_nr)]; + struct phy_instance *pinst = trx_phy_instance(l1t->trx); - if (trx_ms_power_loop) + if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) ms_power_clock(lchan, chan_nr, chan_state); /* count the number of SACCH clocks */ |