aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2016-01-13 10:51:25 +0100
committerJacob Erlbeck <jerlbeck@sysmocom.de>2016-02-05 13:46:21 +0100
commit5058bd6e9e8335ca5cd8ad586de3843447c859bf (patch)
treedcbd39ff0c1904b3b6d70d0a682dd3804aeff517 /tests
parentfec94d1c5c57e328e27a9b0208706a0a54d3da56 (diff)
edge: Select implementation by mode in rlc_data_to_dl_append
Currently the GPRS data block encoding is applied to every coding scheme, even if an MCS is selected. This commit renames the actual encoding function to rlc_data_to_dl_append_gprs (not exported) and puts selection code into Encoding::rlc_data_to_dl_append. This requires an additional cs argument. Sponsored-by: On-Waves ehf
Diffstat (limited to 'tests')
-rw-r--r--tests/edge/EdgeTest.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp
index 70e99d5..c405b4b 100644
--- a/tests/edge/EdgeTest.cpp
+++ b/tests/edge/EdgeTest.cpp
@@ -509,7 +509,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 11);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT);
@@ -520,7 +520,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 26);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT);
@@ -531,7 +531,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 99);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS);
@@ -556,7 +556,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 20);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS);
@@ -575,7 +575,7 @@ static void test_rlc_unit_encoder()
OSMO_ASSERT(llc.chunk_size() == 1);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT);
@@ -586,7 +586,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 99);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS);
@@ -609,7 +609,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 7);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT);
@@ -620,7 +620,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 11);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_COMPLETED_BLOCK_FILLED);
@@ -644,7 +644,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 99);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS);
@@ -667,7 +667,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 20);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, true);
OSMO_ASSERT(ar == Encoding::AR_COMPLETED_BLOCK_FILLED);
@@ -690,7 +690,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 30);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS);
@@ -708,7 +708,7 @@ static void test_rlc_unit_encoder()
OSMO_ASSERT(llc.chunk_size() == 10);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT);
@@ -719,7 +719,7 @@ static void test_rlc_unit_encoder()
llc.reset();
llc.put_frame(llc_data, 99);
- ar = Encoding::rlc_data_to_dl_append(&rdbi,
+ ar = Encoding::rlc_data_to_dl_append(&rdbi, cs,
&llc, &write_offset, &num_chunks, data, false);
OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS);