From 2ae8337669528b8293f26777986940de1b1770d7 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 18 May 2020 11:35:35 +0200 Subject: 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 --- src/pdch.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pdch.h') diff --git a/src/pdch.h b/src/pdch.h index 97b4b236..ec351746 100644 --- a/src/pdch.h +++ b/src/pdch.h @@ -25,9 +25,9 @@ extern "C" { #include #include "gsm_rlcmac.h" +#include "coding_scheme.h" } -#include #include #endif @@ -61,9 +61,9 @@ struct gprs_rlcmac_pdch { int rcv_block(uint8_t *data, uint8_t len, uint32_t fn, struct pcu_l1_meas *meas); int rcv_block_gprs(uint8_t *data, uint8_t data_len, uint32_t fn, - struct pcu_l1_meas *meas, GprsCodingScheme cs); + struct pcu_l1_meas *meas, enum CodingScheme cs); int rcv_data_block(uint8_t *data, uint8_t data_len, uint32_t fn, - struct pcu_l1_meas *meas, GprsCodingScheme cs); + struct pcu_l1_meas *meas, enum CodingScheme cs); gprs_rlcmac_bts *bts_data() const; BTS *bts() const; @@ -113,7 +113,7 @@ struct gprs_rlcmac_pdch { #ifdef __cplusplus private: int rcv_control_block(const uint8_t *data, uint8_t data_len, uint32_t fn, - struct pcu_l1_meas *meas, GprsCodingScheme cs); + struct pcu_l1_meas *meas, enum CodingScheme cs); void rcv_control_ack(Packet_Control_Acknowledgement_t *, uint32_t fn); void rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *, uint32_t fn, struct pcu_l1_meas *meas); -- cgit v1.2.3