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
Quinn-Yan · Jul 29, 2019 · 4954ae6 · 4954ae6
1 parent ff88ba4
commit 4954ae6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -37,7 +37,6 @@ def setUp (self):
     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
@@ -37,7 +37,6 @@ def setUp (self):
     def tearDown (self):
         self.tb = None
 
-    @unittest.expectedFailure
     def test_downlink (self):
         """
            SDCCH8 demapper downlink test