<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20921">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: define egprs_enabled as bool<br><br>Change-Id: I66a8254ee392ad75226c58b7df5746f409463f0f<br>---<br>M src/bts.h<br>M src/pcu_vty.c<br>M tests/tbf/TbfTest.cpp<br>3 files changed, 16 insertions(+), 15 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/21/20921/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 4340199..a3fa975 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -43,6 +43,7 @@</span><br><span> </span><br><span> #include <pdch.h></span><br><span> #include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span> </span><br><span> #define LLC_CODEL_DISABLE 0</span><br><span> #define LLC_CODEL_USE_DEFAULT (-1)</span><br><span>@@ -136,7 +137,7 @@</span><br><span> </span><br><span> uint8_t force_two_phase;</span><br><span> uint8_t alpha, gamma;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t egprs_enabled;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool egprs_enabled;</span><br><span> bool dl_tbf_preemptive_retransmission;</span><br><span> uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span> bool si13_is_set;</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 1602aef..6dfcdf5 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -281,7 +281,7 @@</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -294,7 +294,7 @@</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index d4a5618..04e711c 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -1737,7 +1737,7 @@</span><br><span> </span><br><span> setup_bts(&the_bts, ts_no, 4);</span><br><span> the_bts.bts_data()->initial_mcs_dl = 9;</span><br><span style="color: hsl(0, 100%, 40%);">- the_bts.bts_data()->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_bts.bts_data()->egprs_enabled = true;</span><br><span> bts = the_bts.bts_data();</span><br><span> bts->ws_base = 128;</span><br><span> bts->ws_pdch = 64;</span><br><span>@@ -2177,7 +2177,7 @@</span><br><span> setup_bts(&the_bts, ts_no);</span><br><span> </span><br><span> /* EGPRS-only */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> </span><br><span> gprs_bssgp_init(bts, 3234, 3234, 1, 1, false, 0, 0, 0);</span><br><span> </span><br><span>@@ -2257,7 +2257,7 @@</span><br><span> ws_check(dl_tbf, __func__, 4, 64, true, false);</span><br><span> </span><br><span> /* EGPRS-only */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> </span><br><span> /* Does support EGPRS */</span><br><span> ms = the_bts.ms_alloc(ms_class, ms_class);</span><br><span>@@ -2297,7 +2297,7 @@</span><br><span> gprs_bssgp_init(bts, 5234, 5234, 1, 1, false, 0, 0, 0);</span><br><span> </span><br><span> /* EGPRS-only */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> </span><br><span> /* Does support EGPRS */</span><br><span> ms = the_bts.ms_alloc(ms_class, ms_class);</span><br><span>@@ -2330,7 +2330,7 @@</span><br><span> </span><br><span> setup_bts(&the_bts, ts_no, 4);</span><br><span> the_bts.bts_data()->initial_mcs_dl = 9;</span><br><span style="color: hsl(0, 100%, 40%);">- the_bts.bts_data()->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_bts.bts_data()->egprs_enabled = true;</span><br><span> </span><br><span> ul_tbf = puan_urbb_len_issue(&the_bts, ts_no, tlli, &fn, qta,</span><br><span> ms_class, egprs_ms_class);</span><br><span>@@ -2471,7 +2471,7 @@</span><br><span> </span><br><span> setup_bts(&the_bts, ts_no, 4);</span><br><span> the_bts.bts_data()->initial_mcs_dl = 9;</span><br><span style="color: hsl(0, 100%, 40%);">- the_bts.bts_data()->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_bts.bts_data()->egprs_enabled = true;</span><br><span> </span><br><span> ul_tbf = tbf_li_decoding(&the_bts, ts_no, tlli, &fn, qta,</span><br><span> ms_class, egprs_ms_class);</span><br><span>@@ -2515,7 +2515,7 @@</span><br><span> </span><br><span> setup_bts(&the_bts, ts_no);</span><br><span> OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> /* ARQ II */</span><br><span> bts->dl_arq_type = EGPRS_ARQ2;</span><br><span> </span><br><span>@@ -2599,7 +2599,7 @@</span><br><span> </span><br><span> setup_bts(&the_bts, ts_no, 4);</span><br><span> the_bts.bts_data()->initial_mcs_dl = 9;</span><br><span style="color: hsl(0, 100%, 40%);">- the_bts.bts_data()->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_bts.bts_data()->egprs_enabled = true;</span><br><span> </span><br><span> ul_tbf = establish_ul_tbf_two_phase_spb(&the_bts, ts_no, tlli, &fn, qta,</span><br><span> ms_class, egprs_ms_class);</span><br><span>@@ -2629,7 +2629,7 @@</span><br><span> </span><br><span> setup_bts(&the_bts, ts_no, 4);</span><br><span> the_bts.bts_data()->initial_mcs_dl = 9;</span><br><span style="color: hsl(0, 100%, 40%);">- the_bts.bts_data()->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_bts.bts_data()->egprs_enabled = true;</span><br><span> </span><br><span> ul_tbf = establish_ul_tbf_two_phase(&the_bts, ts_no, tlli, &fn, qta,</span><br><span> ms_class, egprs_ms_class);</span><br><span>@@ -3054,7 +3054,7 @@</span><br><span> bts->cs_downgrade_threshold = 0;</span><br><span> setup_bts(&the_bts, ts_no);</span><br><span> OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> /* ARQ II */</span><br><span> bts->dl_arq_type = EGPRS_ARQ2;</span><br><span> </span><br><span>@@ -3083,7 +3083,7 @@</span><br><span> bts->cs_downgrade_threshold = 0;</span><br><span> setup_bts(&the_bts, ts_no);</span><br><span> OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> </span><br><span> /* ARQ I resegmentation support */</span><br><span> bts->dl_arq_type = EGPRS_ARQ1;</span><br><span>@@ -3115,7 +3115,7 @@</span><br><span> </span><br><span> setup_bts(&the_bts, ts_no);</span><br><span> OSMO_ASSERT(osmo_tdef_set(bts->T_defs_pcu, -2031, 200, OSMO_TDEF_MS) == 0);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->egprs_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->egprs_enabled = true;</span><br><span> /* ARQ II */</span><br><span> bts->dl_arq_type = EGPRS_ARQ2;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20921">change 20921</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/+/20921"/><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: I66a8254ee392ad75226c58b7df5746f409463f0f </div>
<div style="display:none"> Gerrit-Change-Number: 20921 </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>