From a7cfd78a1acacf1ef568b70a32b25fbc10501afc Mon Sep 17 00:00:00 2001
From: kaltenbe <kaltenbe@mycompany.com>
Date: Mon, 7 Sep 2015 12:55:09 +0000
Subject: [PATCH] taking out exit on PUCCH-NACK
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7803 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair1/SCHED/phy_procedures_lte_eNb.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index 26f5c661516..2db9023ecc4 100755
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -2020,7 +2020,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
if (harq_pid==255) {
LOG_E(PHY,"[eNB %"PRIu8"] Frame %d: Bad harq_pid for ULSCH allocation\n",phy_vars_eNB->Mod_id,phy_vars_eNB->proc[sched_subframe].frame_tx);
- mac_exit_wrapper("Invalid harq_pid (255) detected");
+ //mac_exit_wrapper("Invalid harq_pid (255) detected");
return; // not reached
}
@@ -2277,7 +2277,10 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
LOG_T(PHY,"%x.",dlsch_input_buffer[i]);
LOG_T(PHY,"\n");
*/
- UE_id = add_ue(crnti,phy_vars_eNB);
+ if (crnti!=0)
+ UE_id = add_ue(crnti,phy_vars_eNB);
+ else
+ UE_id = -1;
if (UE_id==-1) {
LOG_W(PHY,"[eNB] Max user count reached.\n");
@@ -2686,10 +2689,12 @@ void process_HARQ_feedback(uint8_t UE_id,
}
else {
dlsch_ACK[0] = pucch_payload[0];
- LOG_I(PHY,"[eNB %d] Frame %d: Received ACK/NAK %d on PUCCH for subframe %d\n",phy_vars_eNB->Mod_id,
+ LOG_D(PHY,"[eNB %d] Frame %d: Received ACK/NAK %d on PUCCH for subframe %d\n",phy_vars_eNB->Mod_id,
frame,dlsch_ACK[0],subframe_m4);
+ /*
if (dlsch_ACK[0]==0)
AssertFatal(0,"Exiting on NAK on PUCCH\n");
+ */
}
--
GitLab