<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/16060">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Change gsm_lchan field fixed to bool<br><br>Change-Id: I715ef151b67a21e325c574585a257e71b4b0ce2a<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/rsl.c<br>M tests/power/power_test.c<br>3 files changed, 11 insertions(+), 11 deletions(-)<br><br></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 8678ea5..5061310 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>@@ -323,7 +323,7 @@</span><br><span> /* power handling */</span><br><span> struct {</span><br><span> uint8_t current;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t fixed;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool fixed;</span><br><span> } ms_power_ctrl;</span><br><span> </span><br><span> struct msgb *pending_rel_ind_msg;</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index d8ce016..9a4afb3 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -999,7 +999,7 @@</span><br><span> * cleared, or we would enable encryption on PDCH with parameters remaining from the TCH. */</span><br><span> lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);</span><br><span> lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = false;</span><br><span> lchan->rsl_cmode = 0;</span><br><span> lchan->tch_mode = 0;</span><br><span> memset(&lchan->encr, 0, sizeof(lchan->encr));</span><br><span>@@ -1104,7 +1104,7 @@</span><br><span> /* Initialize channel defaults */</span><br><span> lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);</span><br><span> lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = false;</span><br><span> </span><br><span> rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));</span><br><span> </span><br><span>@@ -1156,7 +1156,7 @@</span><br><span> if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) {</span><br><span> lchan->ms_power = *TLVP_VAL(&tp, RSL_IE_MS_POWER);</span><br><span> lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = false;</span><br><span> }</span><br><span> /* 9.3.24 Timing Advance */</span><br><span> if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1))</span><br><span>@@ -1165,12 +1165,12 @@</span><br><span> /* 9.3.32 BS Power Parameters */</span><br><span> /* 9.3.31 MS Power Parameters */</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM))</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = false;</span><br><span> else {</span><br><span> /* Spec explicitly states BTS should only perform</span><br><span> * autonomous MS power control loop in BTS if 'MS Power</span><br><span> * Parameters' IE is present! */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = true;</span><br><span> }</span><br><span> /* 9.3.16 Physical Context */</span><br><span> </span><br><span>@@ -1642,16 +1642,16 @@</span><br><span> </span><br><span> /* 9.3.31 MS Power Parameters (O) */</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM))</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = false;</span><br><span> else {</span><br><span> /* Spec explicitly states BTS should only perform</span><br><span> * autonomous MS power control loop in BTS if 'MS Power</span><br><span> * Parameters' IE is present! */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = true;</span><br><span> }</span><br><span> </span><br><span> /* Only set current to lchan->ms_power if actual value of current</span><br><span style="color: hsl(0, 100%, 40%);">- in dBm > value in dBm from lchan->ms_power, or if fixed=1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ in dBm > value in dBm from lchan->ms_power, or if fixed. */</span><br><span> if (lchan->ms_power_ctrl.fixed) {</span><br><span> lchan->ms_power_ctrl.current = lchan->ms_power;</span><br><span> } else {</span><br><span>diff --git a/tests/power/power_test.c b/tests/power/power_test.c</span><br><span>index 8df6d69..dbae8fa 100644</span><br><span>--- a/tests/power/power_test.c</span><br><span>+++ b/tests/power/power_test.c</span><br><span>@@ -68,11 +68,11 @@</span><br><span> apply_power_test(lchan, -100, 1, 0);</span><br><span> </span><br><span> /* Fix it and jump down */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = true;</span><br><span> apply_power_test(lchan, -60, 0, 0);</span><br><span> </span><br><span> /* And leave it again */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ms_power_ctrl.fixed = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.fixed = false;</span><br><span> apply_power_test(lchan, -40, 1, 15);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/16060">change 16060</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/+/16060"/><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: I715ef151b67a21e325c574585a257e71b4b0ce2a </div>
<div style="display:none"> Gerrit-Change-Number: 16060 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>