Add data structure for ARQ-II in EGPRS DL

Modify the existing data structure to support ARQ-II for Retx in EGPRS DL.
This will also hadle compilation issue related to renaming the variable.

Change-Id: I734b1024bb32f2daa43af4adf59f4a17f2294afe
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index 4d283a9..9c9154b 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -51,7 +51,7 @@
 	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;
+	GprsCodingScheme cs = _data->cs_last;
 
 	Decoding::RlcData frames[16], *frame;
 	int i, num_frames = 0;
@@ -224,7 +224,7 @@
 			m_window.mod_sns(m_window.v_q() + ws - 1));
 		block = m_rlc.block(rdbi->bsn);
 		block->block_info = *rdbi;
-		block->cs = rlc->cs;
+		block->cs_last = rlc->cs;
 		OSMO_ASSERT(rdbi->data_len <= sizeof(block->block));
 		rlc_data = &(block->block[0]);
 		/* TODO: Handle SPB != 0 -> Set length to 2*len, add offset if