maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

taking out exit on PUCCH-NACK

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7803 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
kaltenbe
2015-09-07 12:55:09 +00:00
parent 80fc74facf
commit a7cfd78a1a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED/phy_procedures_lte_eNb.c
+8 -3
View File
@@ -2020,7 +2020,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
if (harq_pid==255) { 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); 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 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,"%x.",dlsch_input_buffer[i]);
LOG_T(PHY,"\n"); 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) { if (UE_id==-1) {
LOG_W(PHY,"[eNB] Max user count reached.\n"); LOG_W(PHY,"[eNB] Max user count reached.\n");
@@ -2686,10 +2689,12 @@ void process_HARQ_feedback(uint8_t UE_id,
} }
else { else {
dlsch_ACK[0] = pucch_payload[0]; 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); frame,dlsch_ACK[0],subframe_m4);
/*
if (dlsch_ACK[0]==0) if (dlsch_ACK[0]==0)
AssertFatal(0,"Exiting on NAK on PUCCH\n"); AssertFatal(0,"Exiting on NAK on PUCCH\n");
*/
} }