diff options
author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-03 18:28:04 +0100 |
---|---|---|
committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-03 19:23:49 +0100 |
commit | fc6d572c07df78de6066e376e88dfbcee2a62cf9 (patch) | |
tree | ed32fecbf0d2bd6d88cafae7d884ad12d85d3e1f /tests | |
parent | 6c273dc8e7b020856062aa0d6d8ba5f56638d9d4 (diff) |
rlc: Add with_padding argument to gprs_rlc_data_info_init_dl/ul
The offsets of the data areas change when padding is used (see TS
44.060, 9.3.2.1 and Annex J for details).
Extend the parameter lists to pass the with_padding flag and use
that information to compute the correct offsets.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'tests')
-rw-r--r-- | tests/edge/EdgeTest.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 39875b08..160a542b 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -542,7 +542,7 @@ static void test_rlc_unit_encoder() /* TS 44.060, B.1 */ cs = GprsCodingScheme::CS4; - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -589,7 +589,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -609,7 +609,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[1] == 0); /* Block 2 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -642,7 +642,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -677,7 +677,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -700,7 +700,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -723,7 +723,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -742,7 +742,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[0] == 0); /* Block 2 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -775,7 +775,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS4; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -827,7 +827,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS2; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -859,7 +859,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[1] == 0); /* Block 2 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -904,7 +904,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[3] == 0); /* Block 3 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -944,7 +944,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS2; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -968,7 +968,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS2; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -993,7 +993,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS2; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs); + gprs_rlc_data_block_info_init(&rdbi, cs, false); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -1045,7 +1045,7 @@ static void test_rlc_unaligned_copy() block_idx++) { struct gprs_rlc_data_info rlc; - gprs_rlc_data_info_init_dl(&rlc, cs); + gprs_rlc_data_info_init_dl(&rlc, cs, false); memset(bits, pattern, sizeof(bits)); Decoding::rlc_copy_to_aligned_buffer( @@ -1089,12 +1089,12 @@ static void test_rlc_info_init() struct gprs_rlc_data_info rlc; printf("=== start %s ===\n", __func__); - gprs_rlc_data_info_init_dl(&rlc, GprsCodingScheme(GprsCodingScheme::CS1)); + gprs_rlc_data_info_init_dl(&rlc, GprsCodingScheme(GprsCodingScheme::CS1), false); OSMO_ASSERT(rlc.num_data_blocks == 1); OSMO_ASSERT(rlc.data_offs_bits[0] == 24); OSMO_ASSERT(rlc.block_info[0].data_len == 20); - gprs_rlc_data_info_init_dl(&rlc, GprsCodingScheme(GprsCodingScheme::MCS1)); + gprs_rlc_data_info_init_dl(&rlc, GprsCodingScheme(GprsCodingScheme::MCS1), false); OSMO_ASSERT(rlc.num_data_blocks == 1); OSMO_ASSERT(rlc.data_offs_bits[0] == 33); OSMO_ASSERT(rlc.block_info[0].data_len == 22); |