ptrkrysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/gr-gsm/+/14946 )
Change subject: Fix sub_slot assignment in the universal_ctrl_chans_demapper
block
......................................................................
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
---
M lib/demapping/universal_ctrl_chans_demapper_impl.cc
M python/qa_gsm_bcch_ccch_sdcch4_demapper.py
M python/qa_gsm_sdcch8_demapper.py
3 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
ptrkrysik: Looks good to me, approved; Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
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 @@
{
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 @@
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 @@
def tearDown (self):
self.tb = None
- @unittest.expectedFailure
def test_downlink (self):
"""
SDCCH8 demapper downlink test
--
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/14946
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: Idc63407694fd1f7be962ab630d4e8c13b4a5d348
Gerrit-Change-Number: 14946
Gerrit-PatchSet: 2
Gerrit-Owner: vvvelichkov <[email protected]>
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: ptrkrysik <[email protected]>
Gerrit-MessageType: merged
