Skip to content

O
OpenXG-RAN
Commit 91585444 authored by Sakthivel Velumani's avatar Sakthivel Velumani
Browse files
Options

fixed merge

parent 9b9295f5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
View file @ 91585444
...@@ -480,7 +480,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB, ...@@ -480,7 +480,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
#endif #endif
NR_gNB_ULSCH_t *ulsch = gNB->ulsch[UE_id][0]; NR_gNB_ULSCH_t *ulsch = phy_vars_gNB->ulsch[UE_id][0];
NR_UL_gNB_HARQ_t *harq_process = ulsch->harq_processes[harq_pid]; NR_UL_gNB_HARQ_t *harq_process = ulsch->harq_processes[harq_pid];
t_nrLDPC_dec_params decParams; t_nrLDPC_dec_params decParams;
...@@ -558,12 +558,12 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB, ...@@ -558,12 +558,12 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
NR_gNB_SCH_STATS_t *stats=NULL; NR_gNB_SCH_STATS_t *stats=NULL;
int first_free=-1; int first_free=-1;
for (int i=0;i<NUMBER_OF_NR_SCH_STATS_MAX;i++) { for (int i=0;i<NUMBER_OF_NR_SCH_STATS_MAX;i++) {
if (gNB->ulsch_stats[i].rnti == 0 && first_free == -1) { if (phy_vars_gNB->ulsch_stats[i].rnti == 0 && first_free == -1) {
first_free = i; first_free = i;
stats=&gNB->ulsch_stats[i]; stats=&phy_vars_gNB->ulsch_stats[i];
} }
if (gNB->ulsch_stats[i].rnti == ulsch->rnti) { if (phy_vars_gNB->ulsch_stats[i].rnti == ulsch->rnti) {
stats=&gNB->ulsch_stats[i]; stats=&phy_vars_gNB->ulsch_stats[i];
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment