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

added null pointer check for ulsim

Browse Source
This commit is contained in:
Florian Kaltenberger
2017-03-16 18:05:23 +01:00
parent bd3394f528
commit c13d5c21f3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED/phy_procedures_lte_ue.c
+9 -7
View File
@@ -641,9 +641,9 @@ void ue_compute_srs_occasion(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id
}
uint8_t pucch_ack_payload[2];
if (get_ack(&ue->frame_parms,
if ((ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack) && (get_ack(&ue->frame_parms,
ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack,
subframe_tx,pucch_ack_payload,0) > 0)
subframe_tx,pucch_ack_payload,0) > 0))
{
is_sr_an_subframe = 1;
}
@@ -2261,12 +2261,14 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
}
// reset DL ACK/NACK status
reset_ack(&ue->frame_parms,
ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack,
subframe_tx,
ue->ulsch[eNB_id]->o_ACK,0);
if (ue->dlsch[proc->subframe_rx&0x1][eNB_id][0] != NULL)
reset_ack(&ue->frame_parms,
ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack,
subframe_tx,
ue->ulsch[eNB_id]->o_ACK,0);
reset_ack(&ue->frame_parms,
if (ue->dlsch_SI[eNB_id] != NULL)
reset_ack(&ue->frame_parms,
ue->dlsch_SI[eNB_id]->harq_ack,
subframe_tx,
ue->ulsch[eNB_id]->o_ACK,0);