<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16058">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Unify common and bts-trx power control loop VTY command<br><br>osmotrx specific commands are marked as deprecated and their<br>implementation changed to set the common code variables. osmo-bts-trx<br>specific power control loop code is also changed to use the common<br>variables.<br><br>Related: OS#1851<br>Change-Id: I8fb310b2aee7780982bd9394bc5e758dfd66be25<br>---<br>M doc/examples/trx/osmo-bts-trx-calypso.cfg<br>M include/osmo-bts/phy_link.h<br>M src/osmo-bts-trx/loops.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/trx_vty.c<br>5 files changed, 17 insertions(+), 22 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/58/16058/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/trx/osmo-bts-trx-calypso.cfg b/doc/examples/trx/osmo-bts-trx-calypso.cfg</span><br><span>index 6b52fd2..d8cddbd 100644</span><br><span>--- a/doc/examples/trx/osmo-bts-trx-calypso.cfg</span><br><span>+++ b/doc/examples/trx/osmo-bts-trx-calypso.cfg</span><br><span>@@ -26,7 +26,6 @@</span><br><span> osmotrx ip local 127.0.0.1</span><br><span> osmotrx ip remote 127.0.0.1</span><br><span> osmotrx timing-advance-loop</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx ms-power-loop -65</span><br><span> osmotrx legacy-setbsic</span><br><span> bts 0</span><br><span> oml remote-ip 127.0.0.1</span><br><span>@@ -36,3 +35,4 @@</span><br><span> band 900</span><br><span> trx 0</span><br><span> phy 0 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ uplink-power-target -65</span><br><span>diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h</span><br><span>index 316a1ba..b2e7c0e 100644</span><br><span>--- a/include/osmo-bts/phy_link.h</span><br><span>+++ b/include/osmo-bts/phy_link.h</span><br><span>@@ -45,8 +45,6 @@</span><br><span> uint16_t base_port_remote;</span><br><span> struct osmo_fd trx_ofd_clk;</span><br><span> bool trx_ta_loop;</span><br><span style="color: hsl(0, 100%, 40%);">- bool trx_ms_power_loop;</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t trx_target_rssi;</span><br><span> uint32_t clock_advance;</span><br><span> uint32_t rts_advance;</span><br><span> bool use_legacy_setbsic;</span><br><span>diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c</span><br><span>index b2b163a..70e566d 100644</span><br><span>--- a/src/osmo-bts-trx/loops.c</span><br><span>+++ b/src/osmo-bts-trx/loops.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <osmo-bts/gsm_data.h></span><br><span> #include <osmo-bts/logging.h></span><br><span> #include <osmo-bts/l1sap.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts.h></span><br><span> #include <osmocom/core/bits.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> </span><br><span>@@ -147,7 +148,6 @@</span><br><span> static void ms_power_clock(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span> int rssi;</span><br><span> int i;</span><br><span> </span><br><span>@@ -188,9 +188,9 @@</span><br><span> /* change RSSI */</span><br><span> LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current "</span><br><span> "MS power: %d (%d dBm)\n", rssi,</span><br><span style="color: hsl(0, 100%, 40%);">- pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->bts->ul_power_target, lchan->ms_power_ctrl.current,</span><br><span> ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current));</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_diff(lchan, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_diff(lchan, trx->bts->ul_power_target - rssi);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -247,7 +247,7 @@</span><br><span> struct phy_instance *pinst = trx_phy_instance(l1t->trx);</span><br><span> </span><br><span> /* if MS power control loop is enabled, handle it */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pinst->phy_link->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_ms_pwr_ctrl_is_osmo(l1t->trx))</span><br><span> ms_power_val(lchan, chan_state, rssi);</span><br><span> </span><br><span> /* if TA loop is enabled, handle it */</span><br><span>@@ -261,12 +261,11 @@</span><br><span> {</span><br><span> struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)]</span><br><span> .lchan[l1sap_chan2ss(chan_nr)];</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = trx_phy_instance(l1t->trx);</span><br><span> </span><br><span> if (lchan->ms_power_ctrl.fixed)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pinst->phy_link->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_ms_pwr_ctrl_is_osmo(l1t->trx))</span><br><span> ms_power_clock(lchan, chan_state);</span><br><span> </span><br><span> /* count the number of SACCH clocks */</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index cf40ea3..b5841b0 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -124,6 +124,8 @@</span><br><span> </span><br><span> int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Enable software based algo for MS Power Control Loop: */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ms_power_control = true;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -136,8 +138,6 @@</span><br><span> plink->u.osmotrx.clock_advance = 20;</span><br><span> plink->u.osmotrx.rts_advance = 5;</span><br><span> plink->u.osmotrx.trx_ta_loop = true;</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_ms_power_loop = false;</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_target_rssi = -10;</span><br><span> /* attempt use newest TRXD version by default: */</span><br><span> plink->u.osmotrx.trxd_hdr_ver_max = TRX_DATA_FORMAT_VER;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c</span><br><span>index 86f5712..5c6aea3 100644</span><br><span>--- a/src/osmo-bts-trx/trx_vty.c</span><br><span>+++ b/src/osmo-bts-trx/trx_vty.c</span><br><span>@@ -160,26 +160,28 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_phy_ms_power_loop, cfg_phy_ms_power_loop_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_phy_ms_power_loop, cfg_phy_ms_power_loop_cmd,</span><br><span> "osmotrx ms-power-loop <-127-127>", OSMOTRX_STR</span><br><span> "Enable MS power control loop\nTarget RSSI value (transceiver specific, "</span><br><span> "should be 6dB or more above noise floor)\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_link *plink = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out (vty, "'osmotrx ms-power-loop' is deprecated, use 'uplink-power-target' instead%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_target_rssi = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_ms_power_loop = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_bts->ul_power_target = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remark: workaround after deprecation only works for 1st TRX */</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_bts->c0->ms_power_control = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_phy_no_ms_power_loop, cfg_phy_no_ms_power_loop_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_phy_no_ms_power_loop, cfg_phy_no_ms_power_loop_cmd,</span><br><span> "no osmotrx ms-power-loop",</span><br><span> NO_STR OSMOTRX_STR "Disable MS power control loop\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_link *plink = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out (vty, "'no osmotrx ms-power-loop' is deprecated, use 'ms-power-control dsp' instead%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.osmotrx.trx_ms_power_loop = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remark: workaround after deprecation only works for 1st TRX */</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_bts->c0->ms_power_control = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -525,10 +527,6 @@</span><br><span> vty_out(vty, " osmotrx ip remote %s%s",</span><br><span> plink->u.osmotrx.remote_ip, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (plink->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmotrx ms-power-loop %d%s", plink->u.osmotrx.trx_target_rssi, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " no osmotrx ms-power-loop%s", VTY_NEWLINE);</span><br><span> vty_out(vty, " %sosmotrx timing-advance-loop%s", (plink->u.osmotrx.trx_ta_loop) ? "" : "no ", VTY_NEWLINE);</span><br><span> </span><br><span> if (plink->u.osmotrx.base_port_local)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16058">change 16058</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/+/16058"/><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: I8fb310b2aee7780982bd9394bc5e758dfd66be25 </div>
<div style="display:none"> Gerrit-Change-Number: 16058 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>