<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16077">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control.c: Fix ms pwr ctrl skipped if MS doesn't support announced MS Power Level<br><br>Related: OS#1851<br>Change-Id: I1a9c00fe4eb3fa1eaa7997a9ec20716ddfe180a7<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/l1sap.c<br>M src/common/power_control.c<br>3 files changed, 15 insertions(+), 2 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/77/16077/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index 8a52fe9..bd10056 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>@@ -322,6 +322,7 @@</span><br><span>                 uint8_t current;</span><br><span>             uint8_t max;</span><br><span>                 bool fixed;</span><br><span style="color: hsl(120, 100%, 40%);">+           int8_t last_received; /* last received MS Power in uplink L1 SACCH, -1 means not set */</span><br><span>      } ms_power_ctrl;</span><br><span>     /* Power levels for BTS */</span><br><span>   uint8_t bs_power;</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 7bf0b09..4937d1e 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1647,6 +1647,7 @@</span><br><span> </span><br><span>   lchan->sacch_deact = 0;</span><br><span>   lchan->s = lchan->ts->trx->bts->radio_link_timeout;</span><br><span style="color: hsl(120, 100%, 40%);">+    lchan->ms_power_ctrl.last_received = -1; /* mark no ms power received yet */</span><br><span> </span><br><span>  rc = l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_ACTIVATE, 0);</span><br><span>        if (rc)</span><br><span>diff --git a/src/common/power_control.c b/src/common/power_control.c</span><br><span>index 574825e..129334e 100644</span><br><span>--- a/src/common/power_control.c</span><br><span>+++ b/src/common/power_control.c</span><br><span>@@ -53,8 +53,19 @@</span><br><span> </span><br><span>        /* The phone hasn't reached the power level yet.</span><br><span>            TODO: store .last and check if MS is trying to move towards current. */</span><br><span style="color: hsl(0, 100%, 40%);">-      if (lchan->ms_power_ctrl.current != ms_power)</span><br><span style="color: hsl(0, 100%, 40%);">-                return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (lchan->ms_power_ctrl.current != ms_power) {</span><br><span style="color: hsl(120, 100%, 40%);">+            if (lchan->ms_power_ctrl.last_received == -1 ||</span><br><span style="color: hsl(120, 100%, 40%);">+                lchan->ms_power_ctrl.last_received != ms_power) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      /* MS Power still changing, keep current power level */</span><br><span style="color: hsl(120, 100%, 40%);">+                       lchan->ms_power_ctrl.last_received = ms_power;</span><br><span style="color: hsl(120, 100%, 40%);">+                     return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span style="color: hsl(120, 100%, 40%);">+             /* else: we are stuck with some received MS Power level</span><br><span style="color: hsl(120, 100%, 40%);">+                  different than the one we announce, probably because the MS</span><br><span style="color: hsl(120, 100%, 40%);">+                   doesn't support that exact one so it picked the nearest one</span><br><span style="color: hsl(120, 100%, 40%);">+               */</span><br><span style="color: hsl(120, 100%, 40%);">+         lchan->ms_power_ctrl.last_received = ms_power;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span> </span><br><span>        /* How many dBs measured power should be increased (+) or decreased (-)</span><br><span>         to reach expected power. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16077">change 16077</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/+/16077"/><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: I1a9c00fe4eb3fa1eaa7997a9ec20716ddfe180a7 </div>
<div style="display:none"> Gerrit-Change-Number: 16077 </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>