<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20992">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Take into account BTS supported (M)CS values when retrieving the maximum<br><br>Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_bssgp_pcu.cpp<br>M src/gprs_ms.cpp<br>4 files changed, 78 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/92/20992/1</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 be957fa..79bb9e6 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -1005,6 +1005,61 @@</span><br><span> bitvec_free(immediate_assignment);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum DL CS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_cs_dl(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts.max_cs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = m_bts.max_cs_dl - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts.cs_supported[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum UL CS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_cs_ul(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts.max_cs_ul)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = m_bts.max_cs_ul - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts.cs_supported[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum DL MCS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_mcs_dl(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts.max_mcs_dl)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = m_bts.max_mcs_dl - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts.mcs_supported[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* return maximum UL MCS supported by BTS and allowed by VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t BTS::max_mcs_ul(void) const</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts.max_mcs_ul)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = m_bts.max_mcs_ul - 1; i >= 0; i--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts.mcs_supported[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return i + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> GprsMs *BTS::ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class)</span><br><span> {</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 9bf80e1..edb5d6e 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -329,6 +329,11 @@</span><br><span> </span><br><span> void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, uint16_t pgroup);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_cs_dl(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_cs_ul(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_mcs_dl(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_mcs_ul(void) const;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> GprsMsStorage &ms_store();</span><br><span> GprsMs *ms_by_tlli(uint32_t tlli, uint32_t old_tlli = 0);</span><br><span> GprsMs *ms_by_imsi(const char *imsi);</span><br><span>diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp</span><br><span>index d36d96d..a788ac0 100644</span><br><span>--- a/src/gprs_bssgp_pcu.cpp</span><br><span>+++ b/src/gprs_bssgp_pcu.cpp</span><br><span>@@ -750,8 +750,8 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (bts->max_mcs_dl) {</span><br><span style="color: hsl(0, 100%, 40%);">- num = bts->max_mcs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (bts->bts->max_mcs_dl()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ num = bts->bts->max_mcs_dl();</span><br><span> } else {</span><br><span> num = 9;</span><br><span> }</span><br><span>@@ -770,8 +770,8 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (bts->max_cs_dl) {</span><br><span style="color: hsl(0, 100%, 40%);">- num = bts->max_cs_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (bts->bts->max_cs_dl()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ num = bts->bts->max_cs_dl();</span><br><span> } else {</span><br><span> num = 4;</span><br><span> }</span><br><span>diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp</span><br><span>index efd1845..b295686 100644</span><br><span>--- a/src/gprs_ms.cpp</span><br><span>+++ b/src/gprs_ms.cpp</span><br><span>@@ -541,9 +541,8 @@</span><br><span> </span><br><span> m_egprs_ms_class = ms_class_;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = m_bts->bts_data();</span><br><span style="color: hsl(0, 100%, 40%);">- if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_ul)) &&</span><br><span style="color: hsl(0, 100%, 40%);">- mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_dl)) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_ul())) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs_is_edge_gmsk(mcs_get_egprs_by_num(m_bts->max_mcs_dl())) &&</span><br><span> mode() != EGPRS)</span><br><span> {</span><br><span> set_mode(EGPRS_GMSK);</span><br><span>@@ -609,26 +608,23 @@</span><br><span> </span><br><span> enum CodingScheme GprsMs::max_cs_ul() const</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> OSMO_ASSERT(m_bts != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- bts_data = m_bts->bts_data();</span><br><span> </span><br><span> if (mcs_is_gprs(m_current_cs_ul)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts_data->max_cs_ul) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts->max_cs_ul()) {</span><br><span> return CS4;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_ul());</span><br><span> }</span><br><span> </span><br><span> if (!mcs_is_edge(m_current_cs_ul))</span><br><span> return UNKNOWN;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts_data->max_mcs_ul)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_egprs_by_num(bts_data->max_mcs_ul);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts_data->max_cs_ul)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_ul);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts->max_mcs_ul())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_egprs_by_num(m_bts->max_mcs_ul());</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (m_bts->max_cs_ul())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_ul());</span><br><span> </span><br><span> return MCS4;</span><br><span> }</span><br><span>@@ -640,26 +636,23 @@</span><br><span> </span><br><span> enum CodingScheme GprsMs::max_cs_dl() const</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> OSMO_ASSERT(m_bts != NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- bts_data = m_bts->bts_data();</span><br><span> </span><br><span> if (mcs_is_gprs(m_current_cs_dl)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts_data->max_cs_dl) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!m_bts->max_cs_dl()) {</span><br><span> return CS4;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_dl());</span><br><span> }</span><br><span> </span><br><span> if (!mcs_is_edge(m_current_cs_dl))</span><br><span> return UNKNOWN;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts_data->max_mcs_dl)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_egprs_by_num(bts_data->max_mcs_dl);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts_data->max_cs_dl)</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_get_gprs_by_num(bts_data->max_cs_dl);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_bts->max_mcs_dl())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_egprs_by_num(m_bts->max_mcs_dl());</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (m_bts->max_cs_dl())</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_get_gprs_by_num(m_bts->max_cs_dl());</span><br><span> </span><br><span> return MCS4;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20992">change 20992</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/+/20992"/><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: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa </div>
<div style="display:none"> Gerrit-Change-Number: 20992 </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>