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/gprs_ms.h | |
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/gprs_ms.h')
-rw-r--r-- | src/gprs_ms.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 688708e7..f7b5c367 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -22,17 +22,17 @@ struct gprs_codel; -#include <gprs_coding_scheme.h> #include "cxx_linuxlist.h" #include "llc.h" #include "tbf.h" #include "tbf_dl.h" #include "pcu_l1_if.h" -#include <gprs_coding_scheme.h> extern "C" { #include <osmocom/core/timer.h> #include <osmocom/core/linuxlist.h> + + #include "coding_scheme.h" } #include <stdint.h> @@ -87,12 +87,12 @@ public: uint8_t egprs_ms_class() const; void set_ms_class(uint8_t ms_class); void set_egprs_ms_class(uint8_t ms_class); - void set_current_cs_dl(CodingScheme scheme); + void set_current_cs_dl(enum CodingScheme scheme); - GprsCodingScheme current_cs_ul() const; - GprsCodingScheme current_cs_dl() const; - GprsCodingScheme max_cs_ul() const; - GprsCodingScheme max_cs_dl() const; + enum CodingScheme current_cs_ul() const; + enum CodingScheme current_cs_dl() const; + enum CodingScheme max_cs_ul() const; + enum CodingScheme max_cs_dl() const; int first_common_ts() const; uint8_t dl_slots() const; @@ -164,8 +164,8 @@ private: uint8_t m_ms_class; uint8_t m_egprs_ms_class; /* current coding scheme */ - GprsCodingScheme m_current_cs_ul; - GprsCodingScheme m_current_cs_dl; + enum CodingScheme m_current_cs_ul; + enum CodingScheme m_current_cs_dl; gprs_llc_queue m_llc_queue; @@ -235,7 +235,7 @@ inline uint8_t GprsMs::egprs_ms_class() const return m_egprs_ms_class; } -inline GprsCodingScheme GprsMs::current_cs_ul() const +inline enum CodingScheme GprsMs::current_cs_ul() const { return m_current_cs_ul; } |