diff options
| author | Max <msuraev@sysmocom.de> | 2019-03-06 17:04:59 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2019-03-12 15:35:40 +0100 |
| commit | bea2edbc46ad990fdbee700a1ecf421f4988de5e (patch) | |
| tree | 1c055b347c471b23e0b185c04d79747fdfd18fd2 /src/gprs_ms.cpp | |
| parent | 1beed38b54592368d627f0cb58c655627c02ef7e (diff) | |
MCS: move Coding Scheme enum outside of class definition
Move generic MCS enum to C header file to simplify further modifications
to GprsCodingScheme class in follow-up patches. This also allows us
to use standard libosmocore value_sting functions in upcoming patches
for IA Rest Octet encoding/decoding.
Related: OS#3014
Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
Diffstat (limited to 'src/gprs_ms.cpp')
| -rw-r--r-- | src/gprs_ms.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp index 88550539..77a8f2ea 100644 --- a/src/gprs_ms.cpp +++ b/src/gprs_ms.cpp @@ -225,13 +225,13 @@ void GprsMs::set_mode(GprsCodingScheme::Mode mode) m_current_cs_ul = GprsCodingScheme::getGprsByNum( m_bts->bts_data()->initial_cs_ul); if (!m_current_cs_ul.isValid()) - m_current_cs_ul = GprsCodingScheme::CS1; + m_current_cs_ul = CS1; } if (!m_current_cs_dl.isGprs()) { m_current_cs_dl = GprsCodingScheme::getGprsByNum( m_bts->bts_data()->initial_cs_dl); if (!m_current_cs_dl.isValid()) - m_current_cs_dl = GprsCodingScheme::CS1; + m_current_cs_dl = CS1; } break; @@ -241,13 +241,13 @@ void GprsMs::set_mode(GprsCodingScheme::Mode mode) m_current_cs_ul = GprsCodingScheme::getEgprsByNum( m_bts->bts_data()->initial_mcs_ul); if (!m_current_cs_ul.isValid()) - m_current_cs_ul = GprsCodingScheme::MCS1; + m_current_cs_ul = MCS1; } if (!m_current_cs_dl.isEgprs()) { m_current_cs_dl = GprsCodingScheme::getEgprsByNum( m_bts->bts_data()->initial_mcs_dl); if (!m_current_cs_dl.isValid()) - m_current_cs_dl = GprsCodingScheme::MCS1; + m_current_cs_dl = MCS1; } break; } @@ -565,7 +565,7 @@ GprsCodingScheme GprsMs::max_cs_ul() const if (m_current_cs_ul.isGprs()) { if (!bts_data->max_cs_ul) - return GprsCodingScheme(GprsCodingScheme::CS4); + return GprsCodingScheme(CS4); return GprsCodingScheme::getGprsByNum(bts_data->max_cs_ul); } @@ -578,10 +578,10 @@ GprsCodingScheme GprsMs::max_cs_ul() const else if (bts_data->max_cs_ul) return GprsCodingScheme::getEgprsByNum(bts_data->max_cs_ul); - return GprsCodingScheme(GprsCodingScheme::MCS4); + return GprsCodingScheme(MCS4); } -void GprsMs::set_current_cs_dl(GprsCodingScheme::Scheme scheme) +void GprsMs::set_current_cs_dl(CodingScheme scheme) { m_current_cs_dl = scheme; } @@ -595,7 +595,7 @@ GprsCodingScheme GprsMs::max_cs_dl() const if (m_current_cs_dl.isGprs()) { if (!bts_data->max_cs_dl) - return GprsCodingScheme(GprsCodingScheme::CS4); + return GprsCodingScheme(CS4); return GprsCodingScheme::getGprsByNum(bts_data->max_cs_dl); } @@ -608,7 +608,7 @@ GprsCodingScheme GprsMs::max_cs_dl() const else if (bts_data->max_cs_dl) return GprsCodingScheme::getEgprsByNum(bts_data->max_cs_dl); - return GprsCodingScheme(GprsCodingScheme::MCS4); + return GprsCodingScheme(MCS4); } void GprsMs::update_cs_ul(const pcu_l1_meas *meas) @@ -746,7 +746,7 @@ GprsCodingScheme GprsMs::current_cs_dl() const cs.dec(mode()); /* CS-2 doesn't gain throughput with small packets, further reduce to CS-1 */ - if (cs == GprsCodingScheme(GprsCodingScheme::CS2)) + if (cs == GprsCodingScheme(CS2)) cs.dec(mode()); return cs; |