<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13060">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MCS: internalize 'family' parameter<br><br>There's no need to expose it in header file as it's only used internally<br>for consistency checks.<br><br>Change-Id: Ic705615cd2a8ca077efef9ea62a2a676f70b4aed<br>---<br>M src/gprs_coding_scheme.cpp<br>M src/gprs_coding_scheme.h<br>2 files changed, 24 insertions(+), 30 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/60/13060/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 3094ae6..bbac6e7 100644</span><br><span>--- a/src/gprs_coding_scheme.cpp</span><br><span>+++ b/src/gprs_coding_scheme.cpp</span><br><span>@@ -53,6 +53,13 @@</span><br><span> }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum Family {</span><br><span style="color: hsl(120, 100%, 40%);">+ FAMILY_INVALID,</span><br><span style="color: hsl(120, 100%, 40%);">+ FAMILY_A,</span><br><span style="color: hsl(120, 100%, 40%);">+ FAMILY_B,</span><br><span style="color: hsl(120, 100%, 40%);">+ FAMILY_C,</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>@@ -63,38 +70,38 @@</span><br><span> uint8_t optional_padding_bits;</span><br><span> const char *name;</span><br><span> GprsCodingScheme::HeaderType data_hdr;</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::Family family;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum Family family;</span><br><span> } mcs_info[GprsCodingScheme::NUM_SCHEMES] = {</span><br><span> {{0, 0}, {0, 0}, 0, 0, "UNKNOWN",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_INVALID, GprsCodingScheme::FAMILY_INVALID},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_INVALID, FAMILY_INVALID},</span><br><span> {{23, 0}, {23, 0}, 20, 0, "CS-1",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},</span><br><span> {{33, 7}, {33, 7}, 30, 0, "CS-2",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},</span><br><span> {{39, 3}, {39, 3}, 36, 0, "CS-3",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},</span><br><span> {{53, 7}, {53, 7}, 50, 0, "CS-4",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},</span><br><span> </span><br><span> {{26, 1}, {26, 1}, 22, 0, "MCS-1",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_C},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_C},</span><br><span> {{32, 1}, {32, 1}, 28, 0, "MCS-2",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_B},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_B},</span><br><span> {{41, 1}, {41, 1}, 37, 48, "MCS-3",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_A},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_A},</span><br><span> {{48, 1}, {48, 1}, 44, 0, "MCS-4",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_C},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_C},</span><br><span> </span><br><span> {{60, 7}, {59, 6}, 56, 0, "MCS-5",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, GprsCodingScheme::FAMILY_B},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, FAMILY_B},</span><br><span> {{78, 7}, {77, 6}, 74, 48, "MCS-6",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, GprsCodingScheme::FAMILY_A},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, FAMILY_A},</span><br><span> {{118, 2}, {117, 4}, 56, 0, "MCS-7",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_B},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, FAMILY_B},</span><br><span> {{142, 2}, {141, 4}, 68, 0, "MCS-8",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_A},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, FAMILY_A},</span><br><span> {{154, 2}, {153, 4}, 74, 0, "MCS-9",</span><br><span style="color: hsl(0, 100%, 40%);">- GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_A},</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, FAMILY_A},</span><br><span> };</span><br><span> </span><br><span> static struct {</span><br><span>@@ -220,11 +227,6 @@</span><br><span> return mcs_info[m_scheme].data_hdr;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-GprsCodingScheme::Family GprsCodingScheme::family() const</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return mcs_info[m_scheme].family;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void GprsCodingScheme::inc(Mode mode)</span><br><span> {</span><br><span> if (!isCompatible(mode))</span><br><span>@@ -296,10 +298,10 @@</span><br><span> if (*this == o)</span><br><span> return true;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (family() == FAMILY_INVALID)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mcs_info[m_scheme].family == FAMILY_INVALID)</span><br><span> return false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return family() == o.family();</span><br><span style="color: hsl(120, 100%, 40%);">+ return mcs_info[m_scheme].family == mcs_info[o.m_scheme].family;</span><br><span> }</span><br><span> </span><br><span> bool GprsCodingScheme::isCombinable(GprsCodingScheme o) const</span><br><span>diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h</span><br><span>index 76cab0f..6087416 100644</span><br><span>--- a/src/gprs_coding_scheme.h</span><br><span>+++ b/src/gprs_coding_scheme.h</span><br><span>@@ -59,13 +59,6 @@</span><br><span> NUM_HEADER_TYPES</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- enum Family {</span><br><span style="color: hsl(0, 100%, 40%);">- FAMILY_INVALID,</span><br><span style="color: hsl(0, 100%, 40%);">- FAMILY_A,</span><br><span style="color: hsl(0, 100%, 40%);">- FAMILY_B,</span><br><span style="color: hsl(0, 100%, 40%);">- FAMILY_C,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> GprsCodingScheme(Scheme s = UNKNOWN);</span><br><span> </span><br><span> operator bool() const {return m_scheme != UNKNOWN;}</span><br><span>@@ -108,7 +101,6 @@</span><br><span> const char *name() const;</span><br><span> HeaderType headerTypeData() const;</span><br><span> HeaderType headerTypeControl() const;</span><br><span style="color: hsl(0, 100%, 40%);">- Family family() const;</span><br><span> </span><br><span> static GprsCodingScheme getBySizeUL(unsigned size);</span><br><span> static GprsCodingScheme getGprsByNum(unsigned num);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13060">change 13060</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/13060"/><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: Ic705615cd2a8ca077efef9ea62a2a676f70b4aed </div>
<div style="display:none"> Gerrit-Change-Number: 13060 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>