Move EGPRS MS mode set to gprs_ms.cpp
Some tests were wrong (TypesTest) and required modification, since they
were setting a EGPRS MS but then expecting a GPRS assignment.
Change-Id: I9d3ee21c765054a36bd22352e48bde5ffca9225a
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 4706eeb..4f685e8 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -117,18 +117,6 @@
tbf_ctr_description,
};
-static void setup_egprs_mode(gprs_rlcmac_bts *bts, GprsMs *ms)
-{
- if (mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_ul)) &&
- mcs_is_edge_gmsk(mcs_get_egprs_by_num(bts->max_mcs_dl)) &&
- ms->mode() != EGPRS)
- {
- ms->set_mode(EGPRS_GMSK);
- } else {
- ms->set_mode(EGPRS);
- }
-}
-
gprs_rlcmac_tbf::Meas::Meas() :
rssi_sum(0),
rssi_num(0)
@@ -757,11 +745,8 @@
struct gprs_rlcmac_bts *bts_data = bts->bts_data();
int rc;
- if (m_ms->egprs_ms_class() > 0 && bts_data->egprs_enabled) {
+ if (m_ms->egprs_ms_class() > 0)
enable_egprs();
- setup_egprs_mode(bts_data, m_ms);
- LOGPTBF(this, LOGL_INFO, "Enabled EGPRS, mode %s\n", mode_name(m_ms->mode()));
- }
m_created_ts = time(NULL);
/* select algorithm */