Change in osmo-pcu[master]: MCS: internalize 'family' parameter

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/13060


Change subject: MCS: internalize 'family' parameter
......................................................................

MCS: internalize 'family' parameter

There's no need to expose it in header file as it's only used internally
for consistency checks.

Change-Id: Ic705615cd2a8ca077efef9ea62a2a676f70b4aed
---
M src/gprs_coding_scheme.cpp
M src/gprs_coding_scheme.h
2 files changed, 24 insertions(+), 30 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/13060/1

diff --git a/src/gprs_coding_scheme.cpp b/src/gprs_coding_scheme.cpp
index 3094ae6..bbac6e7 100644
--- a/src/gprs_coding_scheme.cpp
+++ b/src/gprs_coding_scheme.cpp
@@ -53,6 +53,13 @@
 		}
 	};
 
+enum Family {
+	FAMILY_INVALID,
+	FAMILY_A,
+	FAMILY_B,
+	FAMILY_C,
+};
+
 static struct {
 	struct {
 		uint8_t bytes;
@@ -63,38 +70,38 @@
 	uint8_t optional_padding_bits;
 	const char *name;
 	GprsCodingScheme::HeaderType data_hdr;
-	GprsCodingScheme::Family family;
+	enum Family family;
 } mcs_info[GprsCodingScheme::NUM_SCHEMES] = {
 	{{0, 0},   {0, 0},    0,  0, "UNKNOWN",
-		GprsCodingScheme::HEADER_INVALID, GprsCodingScheme::FAMILY_INVALID},
+		GprsCodingScheme::HEADER_INVALID, FAMILY_INVALID},
 	{{23, 0},  {23, 0},  20,  0, "CS-1",
-		GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},
+		GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},
 	{{33, 7},  {33, 7},  30,  0, "CS-2",
-		GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},
+		GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},
 	{{39, 3},  {39, 3},  36,  0, "CS-3",
-		GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},
+		GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},
 	{{53, 7},  {53, 7},  50,  0, "CS-4",
-		GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID},
+		GprsCodingScheme::HEADER_GPRS_DATA, FAMILY_INVALID},
 
 	{{26, 1},  {26, 1},  22,  0, "MCS-1",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_C},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_C},
 	{{32, 1},  {32, 1},  28,  0, "MCS-2",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_B},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_B},
 	{{41, 1},  {41, 1},  37, 48, "MCS-3",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_A},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_A},
 	{{48, 1},  {48, 1},  44,  0, "MCS-4",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_C},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, FAMILY_C},
 
 	{{60, 7},  {59, 6},  56,  0, "MCS-5",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, GprsCodingScheme::FAMILY_B},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, FAMILY_B},
 	{{78, 7},  {77, 6},  74, 48, "MCS-6",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, GprsCodingScheme::FAMILY_A},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, FAMILY_A},
 	{{118, 2}, {117, 4}, 56,  0, "MCS-7",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_B},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, FAMILY_B},
 	{{142, 2}, {141, 4}, 68,  0, "MCS-8",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_A},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, FAMILY_A},
 	{{154, 2}, {153, 4}, 74,  0, "MCS-9",
-		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_A},
+		GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, FAMILY_A},
 };
 
 static struct {
@@ -220,11 +227,6 @@
 	return mcs_info[m_scheme].data_hdr;
 }
 
-GprsCodingScheme::Family GprsCodingScheme::family() const
-{
-	return mcs_info[m_scheme].family;
-}
-
 void GprsCodingScheme::inc(Mode mode)
 {
 	if (!isCompatible(mode))
@@ -296,10 +298,10 @@
 	if (*this == o)
 		return true;
 
-	if (family() == FAMILY_INVALID)
+	if (mcs_info[m_scheme].family == FAMILY_INVALID)
 		return false;
 
-	return family() == o.family();
+	return mcs_info[m_scheme].family == mcs_info[o.m_scheme].family;
 }
 
 bool GprsCodingScheme::isCombinable(GprsCodingScheme o) const
diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h
index 76cab0f..6087416 100644
--- a/src/gprs_coding_scheme.h
+++ b/src/gprs_coding_scheme.h
@@ -59,13 +59,6 @@
 		NUM_HEADER_TYPES
 	};
 
-	enum Family {
-		FAMILY_INVALID,
-		FAMILY_A,
-		FAMILY_B,
-		FAMILY_C,
-	};
-
 	GprsCodingScheme(Scheme s = UNKNOWN);
 
 	operator bool() const {return m_scheme != UNKNOWN;}
@@ -108,7 +101,6 @@
 	const char *name() const;
 	HeaderType headerTypeData() const;
 	HeaderType headerTypeControl() const;
-	Family family() const;
 
 	static GprsCodingScheme getBySizeUL(unsigned size);
 	static GprsCodingScheme getGprsByNum(unsigned num);

-- 
To view, visit https://gerrit.osmocom.org/13060
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic705615cd2a8ca077efef9ea62a2a676f70b4aed
Gerrit-Change-Number: 13060
Gerrit-PatchSet: 1
Gerrit-Owner: Max <msuraev at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190226/5228cae2/attachment.htm>