<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21435">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: rename MS_UL_PF_ALGO_{NONE,EWMA} to BTS_PF_ALGO_{NONE,EWMA}<br><br>Change-Id: I580512eea1d329a4d25ccbd6fc2ab98b083ec51d<br>Related: SYS#4918<br>---<br>M include/osmo-bts/bts.h<br>M src/common/bts.c<br>M src/common/power_control.c<br>M src/common/vty.c<br>M tests/power/power_test.c<br>5 files changed, 12 insertions(+), 12 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/35/21435/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 66b03e1..37d4c7d 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -96,9 +96,9 @@</span><br><span> };</span><br><span> </span><br><span> /* Tx power filtering algorithm */</span><br><span style="color: hsl(0, 100%, 40%);">-enum ms_ul_pf_algo {</span><br><span style="color: hsl(0, 100%, 40%);">-        MS_UL_PF_ALGO_NONE = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- MS_UL_PF_ALGO_EWMA,</span><br><span style="color: hsl(120, 100%, 40%);">+enum bts_pf_algo {</span><br><span style="color: hsl(120, 100%, 40%);">+       BTS_PF_ALGO_NONE = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_PF_ALGO_EWMA,</span><br><span> };</span><br><span> </span><br><span> /* BTS Site Manager */</span><br><span>@@ -306,7 +306,7 @@</span><br><span>          /* Tolerated deviation from target */</span><br><span>                int hysteresis;</span><br><span>              /* UL RSSI filtering algorithm */</span><br><span style="color: hsl(0, 100%, 40%);">-               enum ms_ul_pf_algo pf_algo;</span><br><span style="color: hsl(120, 100%, 40%);">+           enum bts_pf_algo pf_algo;</span><br><span>            /* (Optional) filtering parameters */</span><br><span>                union {</span><br><span>                      /* Exponentially Weighted Moving Average */</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 6375241..80f4fdd 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -325,7 +325,7 @@</span><br><span>       bts->paging_state = paging_init(bts, 200, 0);</span><br><span>     bts->ul_power_ctrl.target = -75;     /* dBm default */</span><br><span>    bts->ul_power_ctrl.hysteresis = 3;   /* -78 .. -72 dBm */</span><br><span style="color: hsl(0, 100%, 40%);">-    bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_EWMA;</span><br><span style="color: hsl(120, 100%, 40%);">+   bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;</span><br><span>    bts->ul_power_ctrl.pf.ewma.alpha = 50; /* 50% smoothing */</span><br><span>        bts->rtp_jitter_adaptive = false;</span><br><span>         bts->rtp_port_range_start = 16384;</span><br><span>diff --git a/src/common/power_control.c b/src/common/power_control.c</span><br><span>index dc5636c..e022e59 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -130,10 +130,10 @@</span><br><span> </span><br><span>       /* Filter UL RSSI to reduce unnecessary Tx power oscillations */</span><br><span>     switch (bts->ul_power_ctrl.pf_algo) {</span><br><span style="color: hsl(0, 100%, 40%);">-        case MS_UL_PF_ALGO_EWMA:</span><br><span style="color: hsl(120, 100%, 40%);">+      case BTS_PF_ALGO_EWMA:</span><br><span>               avg_ul_rssi_dbm = lchan_ul_pf_ewma(bts, lchan, ul_rssi_dbm);</span><br><span>                 break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case MS_UL_PF_ALGO_NONE:</span><br><span style="color: hsl(120, 100%, 40%);">+      case BTS_PF_ALGO_NONE:</span><br><span>       default:</span><br><span>             /* No filtering (pass through) */</span><br><span>            avg_ul_rssi_dbm = ul_rssi_dbm;</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 34e7cfa..f32f6cd 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -262,11 +262,11 @@</span><br><span> </span><br><span>      /* MS Tx power filtering algorithm and parameters */</span><br><span>         switch (bts->ul_power_ctrl.pf_algo) {</span><br><span style="color: hsl(0, 100%, 40%);">-        case MS_UL_PF_ALGO_EWMA:</span><br><span style="color: hsl(120, 100%, 40%);">+      case BTS_PF_ALGO_EWMA:</span><br><span>               vty_out(vty, " uplink-power-filtering algo ewma beta %u%s",</span><br><span>                        100 - bts->ul_power_ctrl.pf.ewma.alpha, VTY_NEWLINE);</span><br><span>             break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case MS_UL_PF_ALGO_NONE:</span><br><span style="color: hsl(120, 100%, 40%);">+      case BTS_PF_ALGO_NONE:</span><br><span>       default:</span><br><span>             vty_out(vty, " no uplink-power-filtering%s", VTY_NEWLINE);</span><br><span>                 break;</span><br><span>@@ -664,7 +664,7 @@</span><br><span> {</span><br><span>    struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+   bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_NONE;</span><br><span> </span><br><span>        return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -681,7 +681,7 @@</span><br><span> {</span><br><span>  struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_EWMA;</span><br><span style="color: hsl(120, 100%, 40%);">+   bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;</span><br><span>    bts->ul_power_ctrl.pf.ewma.alpha = 100 - atoi(argv[0]);</span><br><span> </span><br><span>       return CMD_SUCCESS;</span><br><span>diff --git a/tests/power/power_test.c b/tests/power/power_test.c</span><br><span>index a686134..14bef08 100644</span><br><span>--- a/tests/power/power_test.c</span><br><span>+++ b/tests/power/power_test.c</span><br><span>@@ -153,7 +153,7 @@</span><br><span>       lchan = &g_trx->ts[0].lchan[0];</span><br><span>       avg100 = &lchan->ms_power_ctrl.avg100_ul_rssi;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       g_bts->ul_power_ctrl.pf_algo = MS_UL_PF_ALGO_EWMA;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;</span><br><span>  g_bts->ul_power_ctrl.pf.ewma.alpha = 20; /* 80% smoothing */</span><br><span> </span><br><span>  lchan->ms_power_ctrl.current = ms_pwr_ctl_lvl(GSM_BAND_1800, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21435">change 21435</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/+/21435"/><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: I580512eea1d329a4d25ccbd6fc2ab98b083ec51d </div>
<div style="display:none"> Gerrit-Change-Number: 21435 </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>