commit a4de02db5db1e90eee071d62a4a502d8cde4b8a7
author Max <msuraev@sysmocom.de> Wed Mar 13 16:35:09 2019 +0100
committer Max <msuraev@sysmocom.de> Sun Mar 24 18:54:52 2019 +0100
tree 25933b45ab1ce68cf3d7c5035b4f4b4fae98eaf2
parent 02fbfc15c7678cb02a19b4c2f01f9efc80756d14

MCS: move Mode enum outside of class definition

Move Mode (EDGE/GPRS) definition and related functions outside of
GprsCodingScheme class. This allows us to use standard libosmocore
value_string functions.

Change-Id: I3baaac7f1ca3f5b88917a23c1679d63847455f47

src/tbf.cpp

diff --git a/src/tbf.cpp b/src/tbf.cpp
index ffe8b82..3d9b5c4 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -897,7 +897,7 @@
 
 	bts = tbf->bts->bts_data();
 
-	if (ms->mode() == GprsCodingScheme::EGPRS)
+	if (ms->mode() == EGPRS)
 		ms_class = egprs_ms_class;
 
 	tbf->m_created_ts = time(NULL);
@@ -954,11 +954,11 @@
 {
 	if (GprsCodingScheme::getEgprsByNum(bts->max_mcs_ul).isEgprsGmsk() &&
 		GprsCodingScheme::getEgprsByNum(bts->max_mcs_dl).isEgprsGmsk() &&
-		ms->mode() != GprsCodingScheme::EGPRS)
+		ms->mode() != EGPRS)
 	{
-		ms->set_mode(GprsCodingScheme::EGPRS_GMSK);
+		ms->set_mode(EGPRS_GMSK);
 	} else {
-		ms->set_mode(GprsCodingScheme::EGPRS);
+		ms->set_mode(EGPRS);
 	}
 }
 
@@ -992,8 +992,7 @@
 	if (egprs_ms_class > 0 && bts->egprs_enabled) {
 		tbf->enable_egprs();
 		setup_egprs_mode(bts, ms);
-		LOGPTBF(tbf, LOGL_INFO, "Enabled EGPRS, mode %s\n",
-			GprsCodingScheme::modeName(ms->mode()));
+		LOGPTBF(tbf, LOGL_INFO, "Enabled EGPRS, mode %s\n", mode_name(ms->mode()));
 	}
 
 	rc = setup_tbf(tbf, ms, use_trx, ms_class, egprs_ms_class, single_slot);
@@ -1085,8 +1084,7 @@
 	if (egprs_ms_class > 0 && bts->egprs_enabled) {
 		tbf->enable_egprs();
 		setup_egprs_mode(bts, ms);
-		LOGPTBF(tbf, LOGL_INFO, "Enabled EGPRS, mode %s\n",
-			GprsCodingScheme::modeName(ms->mode()));
+		LOGPTBF(tbf, LOGL_INFO, "Enabled EGPRS, mode %s\n", mode_name(ms->mode()));
 	}
 
 	rc = setup_tbf(tbf, ms, use_trx, ms_class, 0, single_slot);