diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-05-18 11:35:35 +0200 |
|---|---|---|
| committer | pespin <pespin@sysmocom.de> | 2020-05-20 11:07:07 +0000 |
| commit | 2ae8337669528b8293f26777986940de1b1770d7 (patch) | |
| tree | e703c735e7c85dbde4b215c21fa75f948cd0dd5c /src/tbf_ul.cpp | |
| parent | c10cb81593230269cbc3f23244d8e3fb43b1f465 (diff) | |
Get rid of class GprsCodingScheme
We have same kind of object splitted into two layers, in coding_scheme
and gprs_coding_scheme. Let's merge them together and get rid of the
class, which is not really useful because it's only a set of functions
operating on one enum value.
This change also fixes gcc 10.1.0 error about memseting a complex type
in rlc.h init().
Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
Diffstat (limited to 'src/tbf_ul.cpp')
| -rw-r--r-- | src/tbf_ul.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 009dfcb2..31150801 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -29,7 +29,6 @@ #include <gprs_bssgp_pcu.h> #include <decoding.h> #include <pcu_l1_if.h> -#include <gprs_coding_scheme.h> #include <gprs_ms.h> #include <llc.h> #include "pcu_utils.h" @@ -75,7 +74,7 @@ int gprs_rlcmac_ul_tbf::assemble_forward_llc(const gprs_rlc_data *_data) const uint8_t *data = _data->block; uint8_t len = _data->len; const struct gprs_rlc_data_block_info *rdbi = &_data->block_info; - GprsCodingScheme cs = _data->cs_last; + enum CodingScheme cs = _data->cs_last; Decoding::RlcData frames[16], *frame; int i, num_frames = 0; @@ -523,7 +522,7 @@ 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 (CodingScheme(rlc->cs)) { + switch (rlc->cs) { case MCS3 : block->cs_last = MCS6; LOGPTBFUL(this, LOGL_DEBUG, "Upgrading to MCS6\n"); |