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/tbf_ul.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/tbf_ul.cpp')
-rw-r--r-- | src/tbf_ul.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 7937f8b9..bc36733e 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -501,18 +501,18 @@ egprs_rlc_ul_reseg_bsn_state gprs_rlcmac_ul_tbf::handle_egprs_ul_spb( * upgrade the MCS to the type 2 */ if (assemble_status == EGPRS_RESEG_DEFAULT) { - switch (GprsCodingScheme::Scheme(rlc->cs)) { - case GprsCodingScheme::MCS3 : - block->cs_last = GprsCodingScheme::MCS6; + switch (CodingScheme(rlc->cs)) { + case MCS3 : + block->cs_last = MCS6; LOGPTBFUL(this, LOGL_DEBUG, "Upgrading to MCS6\n"); break; - case GprsCodingScheme::MCS2 : - block->cs_last = GprsCodingScheme::MCS5; + case MCS2 : + block->cs_last = MCS5; LOGPTBFUL(this, LOGL_DEBUG, "Upgrading to MCS5\n"); break; - case GprsCodingScheme::MCS1 : + case MCS1 : LOGPTBFUL(this, LOGL_DEBUG, "Upgrading to MCS4\n"); - block->cs_last = GprsCodingScheme::MCS4; + block->cs_last = MCS4; break; default: LOGPTBFUL(this, LOGL_ERROR, @@ -528,61 +528,61 @@ void gprs_rlcmac_ul_tbf::update_coding_scheme_counter_ul(const GprsCodingScheme { uint8_t coding_scheme = 0; - coding_scheme = GprsCodingScheme::Scheme(cs); + coding_scheme = CodingScheme(cs); if (cs.isGprs()) { switch (coding_scheme) { - case GprsCodingScheme::CS1 : + case CS1 : bts->gprs_ul_cs1(); rate_ctr_inc(&m_ul_gprs_ctrs->ctr[TBF_CTR_GPRS_UL_CS1]); break; - case GprsCodingScheme::CS2 : + case CS2 : bts->gprs_ul_cs2(); rate_ctr_inc(&m_ul_gprs_ctrs->ctr[TBF_CTR_GPRS_UL_CS2]); break; - case GprsCodingScheme::CS3 : + case CS3 : bts->gprs_ul_cs3(); rate_ctr_inc(&m_ul_gprs_ctrs->ctr[TBF_CTR_GPRS_UL_CS3]); break; - case GprsCodingScheme::CS4 : + case CS4 : bts->gprs_ul_cs4(); rate_ctr_inc(&m_ul_gprs_ctrs->ctr[TBF_CTR_GPRS_UL_CS4]); break; } } else { switch (coding_scheme) { - case GprsCodingScheme::MCS1 : + case MCS1 : bts->egprs_ul_mcs1(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS1]); break; - case GprsCodingScheme::MCS2 : + case MCS2 : bts->egprs_ul_mcs2(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS2]); break; - case GprsCodingScheme::MCS3 : + case MCS3 : bts->egprs_ul_mcs3(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS3]); break; - case GprsCodingScheme::MCS4 : + case MCS4 : bts->egprs_ul_mcs4(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS4]); break; - case GprsCodingScheme::MCS5 : + case MCS5 : bts->egprs_ul_mcs5(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS5]); break; - case GprsCodingScheme::MCS6 : + case MCS6 : bts->egprs_ul_mcs6(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS6]); break; - case GprsCodingScheme::MCS7 : + case MCS7 : bts->egprs_ul_mcs7(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS7]); break; - case GprsCodingScheme::MCS8 : + case MCS8 : bts->egprs_ul_mcs8(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS8]); break; - case GprsCodingScheme::MCS9 : + case MCS9 : bts->egprs_ul_mcs9(); rate_ctr_inc(&m_ul_egprs_ctrs->ctr[TBF_CTR_EGPRS_UL_MCS9]); break; |