<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13066">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make get_retx_mcs() into regular function<br><br>Moving from header-defined inline function allows us to hide<br>egprs_mcs_retx_tbl definition and simplify further changes.<br><br>Change-Id: I95258d1558a3b918ae83f1a69e7c3de2b97e5627<br>---<br>M src/gprs_coding_scheme.cpp<br>M src/gprs_coding_scheme.h<br>2 files changed, 14 insertions(+), 18 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/66/13066/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_coding_scheme.cpp b/src/gprs_coding_scheme.cpp</span><br><span>index 3769363..1231f0e 100644</span><br><span>--- a/src/gprs_coding_scheme.cpp</span><br><span>+++ b/src/gprs_coding_scheme.cpp</span><br><span>@@ -21,13 +21,16 @@</span><br><span> </span><br><span> #include "gprs_coding_scheme.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define MAX_NUM_ARQ 2 /* max. number of ARQ */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MAX_NUM_MCS 9 /* max. number of MCS */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * 44.060 Table 8.1.1.1 and Table 8.1.1.2</span><br><span> * It has 3 level indexing. 0th level is ARQ type</span><br><span> * 1st level is Original MCS( index 0 corresponds to MCS1 and so on)</span><br><span> * 2nd level is MS MCS (index 0 corresponds to MCS1 and so on)</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-enum CodingScheme GprsCodingScheme::egprs_mcs_retx_tbl[MAX_NUM_ARQ]</span><br><span style="color: hsl(120, 100%, 40%);">+static enum CodingScheme egprs_mcs_retx_tbl[MAX_NUM_ARQ]</span><br><span> [MAX_NUM_MCS][MAX_NUM_MCS] = {</span><br><span> {</span><br><span> {MCS1, MCS1, MCS1, MCS1, MCS1, MCS1, MCS1, MCS1, MCS1},</span><br><span>@@ -53,6 +56,16 @@</span><br><span> }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+CodingScheme GprsCodingScheme::get_retx_mcs(const GprsCodingScheme mcs,</span><br><span style="color: hsl(120, 100%, 40%);">+ const GprsCodingScheme demanded_mcs,</span><br><span style="color: hsl(120, 100%, 40%);">+ const unsigned arq_type)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(mcs.to_num() > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(demanded_mcs.to_num() > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return egprs_mcs_retx_tbl[arq_type][mcs.to_num() - 1][demanded_mcs.to_num() - 1];</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct {</span><br><span> struct {</span><br><span> uint8_t bytes;</span><br><span>diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h</span><br><span>index 1121d13..89054f5 100644</span><br><span>--- a/src/gprs_coding_scheme.h</span><br><span>+++ b/src/gprs_coding_scheme.h</span><br><span>@@ -31,8 +31,6 @@</span><br><span> class GprsCodingScheme {</span><br><span> public:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define MAX_NUM_ARQ 2 /* max. number of ARQ */</span><br><span style="color: hsl(0, 100%, 40%);">-#define MAX_NUM_MCS 9 /* max. number of MCS */</span><br><span> #define EGPRS_ARQ1 0x0</span><br><span> #define EGPRS_ARQ2 0x1</span><br><span> </span><br><span>@@ -111,9 +109,6 @@</span><br><span> static CodingScheme get_retx_mcs(const GprsCodingScheme mcs,</span><br><span> const GprsCodingScheme retx_mcs,</span><br><span> const unsigned arq_type);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- static enum CodingScheme egprs_mcs_retx_tbl[MAX_NUM_ARQ]</span><br><span style="color: hsl(0, 100%, 40%);">- [MAX_NUM_MCS][MAX_NUM_MCS];</span><br><span> private:</span><br><span> GprsCodingScheme(int s); /* fail on use */</span><br><span> GprsCodingScheme& operator =(int s); /* fail on use */</span><br><span>@@ -206,15 +201,3 @@</span><br><span> {</span><br><span> return a.isCompatible(b) && a.to_num() < b.to_num();</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-inline CodingScheme GprsCodingScheme::get_retx_mcs(</span><br><span style="color: hsl(0, 100%, 40%);">- const GprsCodingScheme mcs,</span><br><span style="color: hsl(0, 100%, 40%);">- const GprsCodingScheme demanded_mcs,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned arq_type)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(mcs.to_num() > 0);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(demanded_mcs.to_num() > 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return egprs_mcs_retx_tbl[arq_type][mcs.to_num() - 1]</span><br><span style="color: hsl(0, 100%, 40%);">- [demanded_mcs.to_num() - 1];</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13066">change 13066</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/13066"/><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: I95258d1558a3b918ae83f1a69e7c3de2b97e5627 </div>
<div style="display:none"> Gerrit-Change-Number: 13066 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>