aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasil Velichkov <vvvelichkov@gmail.com>2019-07-21 21:41:08 +0300
committerVasil Velichkov <vvvelichkov@gmail.com>2019-07-29 21:12:24 +0300
commit7253b19b2c52a5a468904c5b49d0781fb719a3d2 (patch)
tree21f1cb5b22209b93a117cc7713ea17e86bd7ba18
parent873a7ff51d8bf753846236a9c8de4209d5a383eb (diff)
Fix sub_slot assignment in the universal_ctrl_chans_demapper block
3GPP TS 45.002 version 15.1.0 Release 15 Table 3 : Mapping of logical channels onto physical channels (see subclauses 6.3, 6.4, 6.5) Table 4 : Mapping of logical channels onto physical channels (see subclauses 6.3, 6.4, 6.5) Fixes the following tests: qa_gsm_bcch_ccch_sdcch4_demapper.test_downlink qa_gsm_sdcch8_demapper.test_downlink Change-Id: Idc63407694fd1f7be962ab630d4e8c13b4a5d348
-rw-r--r--lib/demapping/universal_ctrl_chans_demapper_impl.cc2
-rw-r--r--python/qa_gsm_bcch_ccch_sdcch4_demapper.py1
-rw-r--r--python/qa_gsm_sdcch8_demapper.py1
3 files changed, 1 insertions, 3 deletions
diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.cc b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
index 98bcc9c..a6ab956 100644
--- a/lib/demapping/universal_ctrl_chans_demapper_impl.cc
+++ b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
@@ -140,7 +140,7 @@ namespace gr {
{
new_header->sub_type = ch_type;
}
- new_header->sub_slot = subslots[fn_mod51 + (51 * (frame_nr % 2))];
+ new_header->sub_slot = subslots[fn_mod102];
if(fn_mod51>=fn51_start && fn_mod51<=fn51_stop)
{
diff --git a/python/qa_gsm_bcch_ccch_sdcch4_demapper.py b/python/qa_gsm_bcch_ccch_sdcch4_demapper.py
index c71a2e1..76f8ecc 100644
--- a/python/qa_gsm_bcch_ccch_sdcch4_demapper.py
+++ b/python/qa_gsm_bcch_ccch_sdcch4_demapper.py
@@ -37,7 +37,6 @@ class qa_bcch_ccch_sdcch4_demapper (gr_unittest.TestCase):
def tearDown (self):
self.tb = None
- @unittest.expectedFailure
def test_downlink (self):
"""
BCCH_CCCH_SDCCH4 demapper downlink test
diff --git a/python/qa_gsm_sdcch8_demapper.py b/python/qa_gsm_sdcch8_demapper.py
index 83d745c..21841a7 100644
--- a/python/qa_gsm_sdcch8_demapper.py
+++ b/python/qa_gsm_sdcch8_demapper.py
@@ -37,7 +37,6 @@ class qa_gsm_sdcch8_demapper (gr_unittest.TestCase):
def tearDown (self):
self.tb = None
- @unittest.expectedFailure
def test_downlink (self):
"""
SDCCH8 demapper downlink test