From 5198703a6fa03399c7b5d0eea13866089e380a22 Mon Sep 17 00:00:00 2001 From: Haruki NAOI <naoi.haruki@jp.fujitsu.com> Date: Tue, 17 Jul 2018 21:52:51 +0900 Subject: [PATCH] fix: Error occurs in pdcch_alloc2ul_frame function. --- openair1/PHY/LTE_TRANSPORT/dci_tools_common.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c b/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c index 842fb376a0..7960331c56 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c +++ b/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c @@ -1099,13 +1099,9 @@ uint32_t pdcch_alloc2ul_frame(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, ui uint32_t ul_frame; if ((frame_parms->frame_type == TDD) && - (frame_parms->tdd_config == 1)) { - if ((n==1)||(n==6)||(n==4)||(n==9)) { // tdd_config 0,1 SF 1,5 + (frame_parms->tdd_config == 1) && + ((n==1)||(n==6)||(n==4)||(n==9))) { // tdd_config 0,1 SF 1,5 ul_frame = (frame + (n < 5 ? 0 : 1)); - } else { - LOG_E(PHY, "frame %d subframe %d: PUSCH frame = ?\n", frame, n); - ul_frame = 0; - } } else if ((frame_parms->frame_type == TDD) && (frame_parms->tdd_config == 6) && ((n==0)||(n==1)||(n==5)||(n==6))) -- GitLab