<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22180">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
lynxis lazus: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move force_two_phase field from BTS to PCU<br><br>Change-Id: I68a6e032f725cde87992b99f039c5280e912faf7<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_pcu.h<br>M src/pcu_vty.c<br>4 files changed, 5 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index ac58f48..f965714 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -903,7 +903,7 @@</span><br><span> </span><br><span> if (chan_req.single_block)</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block allocation\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (m_bts.force_two_phase) {</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (pcu->vty.force_two_phase) {</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block allocation, "</span><br><span> "but we force two phase access\n");</span><br><span> chan_req.single_block = true;</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 4755d2e..2097cca 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -106,7 +106,6 @@</span><br><span> uint8_t n3105;</span><br><span> struct gprs_rlcmac_trx trx[8];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t force_two_phase;</span><br><span> uint8_t alpha, gamma;</span><br><span> bool dl_tbf_preemptive_retransmission;</span><br><span> uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span>diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h</span><br><span>index 9696e96..4920966 100644</span><br><span>--- a/src/gprs_pcu.h</span><br><span>+++ b/src/gprs_pcu.h</span><br><span>@@ -74,6 +74,7 @@</span><br><span> bool force_initial_mcs; /* false=use from BTS true=use from VTY */</span><br><span> uint8_t max_cs_dl, max_cs_ul;</span><br><span> uint8_t max_mcs_dl, max_mcs_ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t force_two_phase;</span><br><span> } vty;</span><br><span> </span><br><span> struct gsmtap_inst *gsmtap;</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index a2c58eb..83fb166 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -227,7 +227,7 @@</span><br><span> vty_out(vty, " alloc-algorithm b%s", VTY_NEWLINE);</span><br><span> if (the_pcu->alloc_algorithm == alloc_algorithm_dynamic)</span><br><span> vty_out(vty, " alloc-algorithm dynamic%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->force_two_phase)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (the_pcu->vty.force_two_phase)</span><br><span> vty_out(vty, " two-phase-access%s", VTY_NEWLINE);</span><br><span> vty_out(vty, " alpha %d%s", bts->alpha, VTY_NEWLINE);</span><br><span> vty_out(vty, " gamma %d%s", bts->gamma * 2, VTY_NEWLINE);</span><br><span>@@ -782,10 +782,7 @@</span><br><span> "Force two phase access when MS requests single phase access\n",</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts->force_two_phase = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.force_two_phase = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -795,10 +792,7 @@</span><br><span> NO_STR "Only use two phase access when requested my MS\n",</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts->force_two_phase = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.force_two_phase = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22180">change 22180</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-pcu/+/22180"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I68a6e032f725cde87992b99f039c5280e912faf7 </div>
<div style="display:none"> Gerrit-Change-Number: 22180 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>