diff options
| author | Max <msuraev@sysmocom.de> | 2019-03-13 17:14:13 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2019-03-19 18:27:06 +0100 |
| commit | 51754b6f35d639e65385e9fdde70323037e37641 (patch) | |
| tree | d0abba8e28de0267c7db6937c5a2f4e94821d956 /src/rlc.cpp | |
| parent | d5ffeb5e63eb223852a577b8f9a3c89bf0809fb3 (diff) | |
MCS: move HeaderType enum outside of class definition
Move functions which compute number of blocks or bits depending on
header type and corresponding enum outside of GprsCodingScheme
class. This will allows us to use standard libosmocore value_sting
functions in upcoming patches for IA Rest Octet encoding/decoding.
Change-Id: Id0873f85e1f16a72e17e7fbc4ad76b194917067f
Diffstat (limited to 'src/rlc.cpp')
| -rw-r--r-- | src/rlc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rlc.cpp b/src/rlc.cpp index 323fde40..e5067c9d 100644 --- a/src/rlc.cpp +++ b/src/rlc.cpp @@ -336,7 +336,7 @@ static void gprs_rlc_data_header_init(struct gprs_rlc_data_info *rlc, rlc->es_p = 0; rlc->rrbp = 0; rlc->pr = 0; - rlc->num_data_blocks = cs.numDataBlocks(); + rlc->num_data_blocks = num_data_blocks(cs.headerTypeData()); rlc->with_padding = with_padding; OSMO_ASSERT(rlc->num_data_blocks <= ARRAY_SIZE(rlc->block_info)); @@ -347,7 +347,7 @@ static void gprs_rlc_data_header_init(struct gprs_rlc_data_info *rlc, rlc->data_offs_bits[i] = header_bits + padding_bits + - (i+1) * cs.numDataBlockHeaderBits() + + (i+1) * num_data_block_header_bits(cs.headerTypeData()) + i * 8 * rlc->block_info[0].data_len; } } @@ -356,7 +356,7 @@ void gprs_rlc_data_info_init_dl(struct gprs_rlc_data_info *rlc, GprsCodingScheme cs, bool with_padding, const unsigned int spb) { return gprs_rlc_data_header_init(rlc, cs, with_padding, - cs.numDataHeaderBitsDL(), spb); + num_data_header_bits_DL(cs.headerTypeData()), spb); } void gprs_rlc_data_info_init_ul(struct gprs_rlc_data_info *rlc, @@ -367,7 +367,7 @@ void gprs_rlc_data_info_init_ul(struct gprs_rlc_data_info *rlc, * for both DL and UL */ return gprs_rlc_data_header_init(rlc, cs, with_padding, - cs.numDataHeaderBitsUL(), 0); + num_data_header_bits_UL(cs.headerTypeData()), 0); } void gprs_rlc_data_block_info_init(struct gprs_rlc_data_block_info *rdbi, |