edge: Use GprsCodingScheme to adjust the UL RLC block size

Currently the block size is mapped by a switch statement to strip
extra bits that are not used for RLC blocks. That information is
already available via the GprsCodingScheme class.

This commit moves the CS/MCS detection to the rcv_block message and
passes the cs object via rcv_block_gprs, where the length gets
adjusted, to gprs_rlcmac_pdch::rcv_data_block_acknowledged. There the
switch statement is removed.

Note that the TbfTest.err changes due to an additional log message.

Sponsored-by: On-Waves ehf

1 files changed, 3 insertions, 0 deletions

diff --git a/src/bts.h b/src/bts.h
index 8831aca..ecbc0c9 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -33,6 +33,7 @@ extern "C" {
 #include "sba.h"
 #include "tbf.h"
 #include "gprs_ms_storage.h"
+#include "gprs_coding_scheme.h"
 #endif
 
 #include <stdint.h>
@@ -63,6 +64,8 @@ struct gprs_rlcmac_pdch {
 	/* dispatching of messages */
 	int rcv_block(uint8_t *data, uint8_t len, uint32_t fn,
 		struct pcu_l1_meas *meas);
+	int rcv_block_gprs(uint8_t *data, uint32_t fn,
+		struct pcu_l1_meas *meas, GprsCodingScheme cs);
 
 	gprs_rlcmac_bts *bts_data() const;
 	BTS *bts() const;