From 50b097003baac3903c9d52a609b091c76ca83e3c Mon Sep 17 00:00:00 2001 From: Aravind Sirsikar Date: Mon, 22 Aug 2016 17:21:10 +0530 Subject: Modify EGPRS DL TBF flow to support SPB Modify the EGPRS DL TBF flow to support Split block during Retx. This patch will also Upgrade the test suite with test cases to validate the EGPRS Downlink SPB for Retransmission Scenarios like MCS6->MCS3, MCS4->MCS1, MCS5->MCS2, MCS9->MCS3 MCS7->MCS2, MCS8->MCS3 have been simulated and Integration tested in NuRAN 1.0 hardware thoroughly. Change-Id: I242afdd8ae7622dec8593b26382ad66bad5b9516 --- tests/edge/EdgeTest.cpp | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'tests/edge') diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 807102c9..9081d4dd 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -517,7 +517,7 @@ static void test_rlc_unit_encoder() /* TS 44.060, B.1 */ cs = GprsCodingScheme::CS4; - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -570,7 +570,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -592,7 +592,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[1] == 0); /* Block 2 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -630,7 +630,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -669,7 +669,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -694,7 +694,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -719,7 +719,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::CS1; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -740,7 +740,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[0] == 0); /* Block 2 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -777,7 +777,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS4; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -835,7 +835,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS2; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -872,7 +872,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[1] == 0); /* Block 2 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -923,7 +923,7 @@ static void test_rlc_unit_encoder() OSMO_ASSERT(data[3] == 0); /* Block 3 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -967,7 +967,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS2; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); 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, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -1020,7 +1020,7 @@ static void test_rlc_unit_encoder() cs = GprsCodingScheme::MCS2; /* Block 1 */ - gprs_rlc_data_block_info_init(&rdbi, cs, false); + gprs_rlc_data_block_info_init(&rdbi, cs, false, 0); num_chunks = 0; write_offset = 0; memset(data, 0, sizeof(data)); @@ -1074,7 +1074,7 @@ static void test_rlc_unaligned_copy() block_idx++) { struct gprs_rlc_data_info rlc; - gprs_rlc_data_info_init_dl(&rlc, cs, false); + gprs_rlc_data_info_init_dl(&rlc, cs, false, 0); memset(bits, pattern, sizeof(bits)); Decoding::rlc_copy_to_aligned_buffer( @@ -1118,12 +1118,14 @@ 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), false); + gprs_rlc_data_info_init_dl(&rlc, + GprsCodingScheme(GprsCodingScheme::CS1), false, 0); 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), false); + gprs_rlc_data_info_init_dl(&rlc, + GprsCodingScheme(GprsCodingScheme::MCS1), false, 0); OSMO_ASSERT(rlc.num_data_blocks == 1); OSMO_ASSERT(rlc.data_offs_bits[0] == 33); OSMO_ASSERT(rlc.block_info[0].data_len == 22); -- cgit v1.2.3