<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16059">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Change gsm_bts_trx field to bool and rename it<br><br>Thies field is used to store and retrieve whether MS power needs to be<br>calculated and updated by osmo-bts software or autonomously by lower<br>layers. Previous name was not clear<br>and may have been understood as indicating whether MS Power Control loop<br>is done or not in general, and the responsible for that is located under<br>lchan's ms_power_ctrl.fixed.<br><br>Related: OS#1851<br>Change-Id: Ic690ab69866a7377f1597e24aa7b0214831c1cbe<br>---<br>M include/osmo-bts/bts.h<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/bts.c<br>M src/common/vty.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/trx_vty.c<br>M tests/power/power_test.c<br>7 files changed, 10 insertions(+), 10 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/59/16059/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index 5c719f9..63412f9 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -49,7 +49,7 @@</span><br><span> uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg);</span><br><span> void bts_update_status(enum bts_global_status which, int on);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx);</span><br><span> </span><br><span> struct gsm_time *get_time(struct gsm_bts *bts);</span><br><span> </span><br><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index 1445ed2..8678ea5 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -417,7 +417,7 @@</span><br><span> </span><br><span> </span><br><span> struct trx_power_params power_params;</span><br><span style="color: hsl(0, 100%, 40%);">- int ms_power_control;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool ms_pwr_ctl_soft; /* is power control loop done by osmocom software? */</span><br><span> </span><br><span> struct {</span><br><span> void *l1h;</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 60e27cc..3809eb3 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -778,9 +778,9 @@</span><br><span> return sup > 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+bool trx_ms_pwr_ctrl_is_osmo(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return trx->ms_power_control == 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx->ms_pwr_ctl_soft;</span><br><span> }</span><br><span> </span><br><span> struct gsm_time *get_time(struct gsm_bts *bts)</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index e775d99..6ae82d1 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -332,7 +332,7 @@</span><br><span> vty_out(vty, " power-ramp step-interval %d%s",</span><br><span> tpp->ramp.step_interval_sec, VTY_NEWLINE);</span><br><span> vty_out(vty, " ms-power-control %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ms_power_control == 0 ? "dsp" : "osmo",</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ms_pwr_ctl_soft == 0 ? "dsp" : "osmo",</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " phy %u instance %u%s", pinst->phy_link->num,</span><br><span> pinst->num, VTY_NEWLINE);</span><br><span>@@ -790,7 +790,7 @@</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx->ms_power_control = argv[0][0] == 'd' ? 0 : 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ms_pwr_ctl_soft = !strcmp(argv[0], "osmo");</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index b5841b0..e962e9a 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -125,7 +125,7 @@</span><br><span> int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span> /* Enable software based algo for MS Power Control Loop: */</span><br><span style="color: hsl(0, 100%, 40%);">- trx->ms_power_control = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ms_pwr_ctl_soft = true;</span><br><span> return 0;</span><br><span> }</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 5c6aea3..b34114c 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>@@ -169,7 +169,7 @@</span><br><span> </span><br><span> vty_bts->ul_power_target = atoi(argv[0]);</span><br><span> /* Remark: workaround after deprecation only works for 1st TRX */</span><br><span style="color: hsl(0, 100%, 40%);">- vty_bts->c0->ms_power_control = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_bts->c0->ms_pwr_ctl_soft = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -181,7 +181,7 @@</span><br><span> 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> /* Remark: workaround after deprecation only works for 1st TRX */</span><br><span style="color: hsl(0, 100%, 40%);">- vty_bts->c0->ms_power_control = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_bts->c0->ms_pwr_ctl_soft = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/tests/power/power_test.c b/tests/power/power_test.c</span><br><span>index a46a430..8df6d69 100644</span><br><span>--- a/tests/power/power_test.c</span><br><span>+++ b/tests/power/power_test.c</span><br><span>@@ -48,7 +48,7 @@</span><br><span> ts.trx = &trx;</span><br><span> trx.bts = &bts;</span><br><span> bts.band = GSM_BAND_1800;</span><br><span style="color: hsl(0, 100%, 40%);">- trx.ms_power_control = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx.ms_pwr_ctl_soft = true;</span><br><span> bts.ul_power_target = -75;</span><br><span> </span><br><span> lchan->state = LCHAN_S_NONE;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16059">change 16059</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/+/16059"/><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: Ic690ab69866a7377f1597e24aa7b0214831c1cbe </div>
<div style="display:none"> Gerrit-Change-Number: 16059 </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>