<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13057">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use boolean for DL resegmentation parameter<br><br>In some places #define was used for DL resegmentation parameter, in<br>other int, in some other bool. Let's clarify this and always use boolean<br>value.<br><br>Change-Id: I4d4fe5fe12068a4532cb3b61d4eeb229a77c1476<br>---<br>M src/bts.h<br>M src/gprs_coding_scheme.h<br>M src/pcu_main.cpp<br>M src/pcu_vty.c<br>M tests/tbf/TbfTest.cpp<br>5 files changed, 9 insertions(+), 11 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/57/13057/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 578cece..51edc82 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -135,8 +135,8 @@</span><br><span> uint32_t dl_tbf_idle_msec; /* hold time for idle DL TBFs */</span><br><span> uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span> bool si13_is_set;</span><br><span style="color: hsl(0, 100%, 40%);">- /* 0 to support resegmentation in DL, 1 for no reseg */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t dl_arq_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* false to support resegmentation in DL, true for no resegmentation */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool dl_arq_type;</span><br><span> </span><br><span> uint32_t ms_idle_sec;</span><br><span> uint8_t cs_adj_enabled;</span><br><span>diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h</span><br><span>index 76cab0f..3c47266 100644</span><br><span>--- a/src/gprs_coding_scheme.h</span><br><span>+++ b/src/gprs_coding_scheme.h</span><br><span>@@ -32,8 +32,6 @@</span><br><span> </span><br><span> #define MAX_NUM_ARQ 2 /* max. number of ARQ */</span><br><span> #define MAX_NUM_MCS 9 /* max. number of MCS */</span><br><span style="color: hsl(0, 100%, 40%);">-#define EGPRS_ARQ1 0x0</span><br><span style="color: hsl(0, 100%, 40%);">-#define EGPRS_ARQ2 0x1</span><br><span> </span><br><span> enum Scheme {</span><br><span> UNKNOWN,</span><br><span>diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp</span><br><span>index fe85160..8414ae3 100644</span><br><span>--- a/src/pcu_main.cpp</span><br><span>+++ b/src/pcu_main.cpp</span><br><span>@@ -263,7 +263,7 @@</span><br><span> * By default resegmentation is supported in DL</span><br><span> * can also be configured through VTY</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->dl_arq_type = EGPRS_ARQ1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_arq_type = false;</span><br><span> </span><br><span> bts->pcu_sock_path = talloc_strdup(tall_pcu_ctx, PCU_SOCK_DEFAULT);</span><br><span> </span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 960c90d..2d1903d 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -594,9 +594,9 @@</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span> if (!strcmp(argv[0], "arq2"))</span><br><span style="color: hsl(0, 100%, 40%);">- bts->dl_arq_type = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_arq_type = true;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- bts->dl_arq_type = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_arq_type = 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 dfed79e..f96956f 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -2487,7 +2487,7 @@</span><br><span> bts->dl_tbf_idle_msec = 200;</span><br><span> bts->egprs_enabled = 1;</span><br><span> /* ARQ II */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->dl_arq_type = EGPRS_ARQ2;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_arq_type = true;</span><br><span> </span><br><span> /*</span><br><span> * Simulate a message captured during over-the-air testing,</span><br><span>@@ -3022,7 +3022,7 @@</span><br><span> bts->dl_tbf_idle_msec = 200;</span><br><span> bts->egprs_enabled = 1;</span><br><span> /* ARQ II */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->dl_arq_type = EGPRS_ARQ2;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_arq_type = true;</span><br><span> </span><br><span> </span><br><span> /* First parameter is current MCS, second one is demanded_mcs */</span><br><span>@@ -3052,7 +3052,7 @@</span><br><span> bts->egprs_enabled = 1;</span><br><span> </span><br><span> /* ARQ I resegmentation support */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->dl_arq_type = EGPRS_ARQ1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_arq_type = false;</span><br><span> </span><br><span> /*</span><br><span> * First parameter is current MCS, second one is demanded_mcs</span><br><span>@@ -3083,7 +3083,7 @@</span><br><span> bts->dl_tbf_idle_msec = 200;</span><br><span> bts->egprs_enabled = 1;</span><br><span> /* ARQ II */</span><br><span style="color: hsl(0, 100%, 40%);">- bts->dl_arq_type = EGPRS_ARQ2;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->dl_arq_type = true;</span><br><span> </span><br><span> for (i = 1; i <= 9; i++)</span><br><span> establish_and_use_egprs_dl_tbf(&the_bts, i);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13057">change 13057</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/13057"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4d4fe5fe12068a4532cb3b61d4eeb229a77c1476 </div>
<div style="display:none"> Gerrit-Change-Number: 13057 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>