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

1 files changed, 7 insertions, 5 deletions

diff --git a/src/tbf.h b/src/tbf.h
index 2b4cf6df..be3336a9 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -24,14 +24,16 @@
 #include "rlc.h"
 #include "cxx_linuxlist.h"
 #include <gprs_debug.h>
-#include <gprs_coding_scheme.h>
 #include <gsm_timer.h>
 #include <stdint.h>
+
 extern "C" {
 #include <osmocom/core/utils.h>
-	#include <osmocom/core/linuxlist.h>
-	#include <osmocom/core/logging.h>
-	#include <osmocom/core/timer.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/timer.h>
+
+#include "coding_scheme.h"
 }
 
 struct bssgp_bvc_ctx;
@@ -245,7 +247,7 @@ struct gprs_rlcmac_tbf {
 	void set_ta(uint8_t);
 	uint8_t ms_class() const;
 	void set_ms_class(uint8_t);
-	GprsCodingScheme current_cs() const;
+	enum CodingScheme current_cs() const;
 	size_t llc_queue_size() const;
 
 	time_t created_ts() const;