From ac0d39af37ee1a6b2f99526c6428dc2e27857764 Mon Sep 17 00:00:00 2001
From: Xu Bo <xubo1@cn.fujitsu.com>
Date: Thu, 23 Nov 2017 16:23:08 +0900
Subject: [PATCH] fix ULSCH harq_pid calculate issue
---
openair1/PHY/LTE_TRANSPORT/dci_tools.c | 2 +-
openair2/LAYER2/MAC/pre_processor.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index 97a9709df5..b800fb5402 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -6492,7 +6492,7 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
else
ul_subframe = ((n+4)%10);
- if (subframe_select(frame_parms,ul_subframe) != SF_UL) return(255);
+ if ( (subframe_select(frame_parms,ul_subframe) != SF_UL) && (frame_parms->frame_type == TDD)) return(255);
LOG_D(PHY, "subframe %d: PUSCH subframe = %d\n", n, ul_subframe);
return ul_subframe;
diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c
index 622d961816..a4e4808060 100644
--- a/openair2/LAYER2/MAC/pre_processor.c
+++ b/openair2/LAYER2/MAC/pre_processor.c
@@ -2075,7 +2075,7 @@ void ulsch_scheduler_pre_ue_select(
cc = &eNB->common_channels[CC_id];
//harq_pid
- harq_pid = subframe2harqpid(cc,frameP,subframeP);
+ harq_pid = subframe2harqpid(cc,(frameP+(subframeP>=6 ? 1 : 0)),((subframeP+4)%10));
//round
round = UE_list->UE_sched_ctrl[UE_id].round_UL[CC_id][harq_pid];
--
GitLab