diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-01-13 13:09:09 +0100 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-02 17:06:32 +0100 |
| commit | fffd366c6c8465729f70c84fad230187a26ec64f (patch) | |
| tree | b901770ab7cebe5210b3bd7df57cc958edbea303 | |
| parent | 9de475d8f33ce4c4d76a603edac792830a16c89e (diff) | |
WIP: Provide and use CS -> CPS conversion
Ticket: OW#????
Sponsored-by: On-Waves ehf
| -rw-r--r-- | src/rlc.cpp | 15 | ||||
| -rw-r--r-- | src/rlc.h | 1 | ||||
| -rw-r--r-- | src/tbf_dl.cpp | 1 | ||||
| -rw-r--r-- | tests/edge/EdgeTest.cpp | 19 | ||||
| -rw-r--r-- | tests/edge/EdgeTest.ok | 2 |
5 files changed, 38 insertions, 0 deletions
diff --git a/src/rlc.cpp b/src/rlc.cpp index 44ce817b..1a8efdf6 100644 --- a/src/rlc.cpp +++ b/src/rlc.cpp @@ -311,3 +311,18 @@ void gprs_rlc_data_block_info_init(struct gprs_rlc_data_block_info *rdbi, rdbi->pi = 0; rdbi->spb = 0; } + +unsigned int gprs_rlc_mcs_cps(GprsCodingScheme cs, int punct, int with_padding) +{ + switch (GprsCodingScheme::Scheme(cs)) { + case GprsCodingScheme::MCS1: return 0b1011 + punct % 2; + case GprsCodingScheme::MCS2: return 0b1001 + punct % 2; + case GprsCodingScheme::MCS3: return (with_padding ? 0b0110 : 0b0011) + + punct % 3; + case GprsCodingScheme::MCS4: return 0b0000 + punct % 3; + /* TODO: Add missing MCS */ + default: ; + } + + return -1; +} @@ -105,6 +105,7 @@ void gprs_rlc_data_info_init_ul(struct gprs_rlc_data_info *rlc, GprsCodingScheme cs); void gprs_rlc_data_block_info_init(struct gprs_rlc_data_block_info *rdbi, GprsCodingScheme cs); +unsigned int gprs_rlc_mcs_cps(GprsCodingScheme cs, int punct, int with_padding); /* * I hold the currently transferred blocks and will provide diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 5607e9e3..e742c799 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -539,6 +539,7 @@ struct msgb *gprs_rlcmac_dl_tbf::create_dl_acked_block( rlc.usf = 7; /* will be set at scheduler */ rlc.pr = 0; /* FIXME: power reduction */ rlc.tfi = m_tfi; /* TFI */ + rlc.cps = gprs_rlc_mcs_cps(cs, 0, 0); rlc.block_info[data_block_idx] = m_rlc.block(index)->block_info; rdbi = &rlc.block_info[data_block_idx]; diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index dc9925fd..c0e56de4 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -992,6 +992,24 @@ static void test_rlc_unaligned_copy() } } +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)); + 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)); + OSMO_ASSERT(rlc.num_data_blocks == 1); + OSMO_ASSERT(rlc.data_offs_bits[0] == 33); + OSMO_ASSERT(rlc.block_info[0].data_len == 22); + + printf("=== end %s ===\n", __func__); +} + static const struct log_info_cat default_categories[] = { {"DCSN1", "\033[1;31m", "Concrete Syntax Notation One (CSN1)", LOGL_INFO, 0}, {"DL1IF", "\033[1;32m", "GPRS PCU L1 interface (L1IF)", LOGL_DEBUG, 1}, @@ -1035,6 +1053,7 @@ int main(int argc, char **argv) pcu_vty_init(&debug_log_info); test_coding_scheme(); + test_rlc_info_init(); test_rlc_unit_decoder(); test_rlc_unaligned_copy(); test_rlc_unit_encoder(); diff --git a/tests/edge/EdgeTest.ok b/tests/edge/EdgeTest.ok index 28431ec2..9554df35 100644 --- a/tests/edge/EdgeTest.ok +++ b/tests/edge/EdgeTest.ok @@ -1,5 +1,7 @@ === start test_coding_scheme === === end test_coding_scheme === +=== start test_rlc_info_init === +=== end test_rlc_info_init === === start test_rlc_unit_decoder === === end test_rlc_unit_decoder === === start test_rlc_unit_encoder === |