From 8e00f8df08ea24e604e949a53d3d7f583a6a162e Mon Sep 17 00:00:00 2001
From: Khalid Ahmed <khalid.ahmed@iis.fraunhofer.de>
Date: Tue, 17 Dec 2019 12:18:04 +0100
Subject: [PATCH] Fixing a bug in number of UL DMRS symbol computation

---
 openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c |  6 +++---
 openair1/SCHED_NR/phy_procedures_nr_gNB.c  | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
index b07d9c31f2..dfdce058d8 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
@@ -123,7 +123,9 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
     ulsch_ue = UE->ulsch[thread_id][gNB_id][cwd_index];
     harq_process_ul_ue = ulsch_ue->harq_processes[harq_pid];
 
-    for (i = 0; i < NR_SYMBOLS_PER_SLOT; i++)
+    start_symbol = harq_process_ul_ue->start_symbol;
+
+    for (i = start_symbol; i < start_symbol + harq_process_ul_ue->number_of_symbols; i++)
       number_dmrs_symbols += is_dmrs_symbol(i,
                                             0,
                                             0,
@@ -219,8 +221,6 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
 
   }
 
-  start_symbol = 14 - harq_process_ul_ue->number_of_symbols;
-
   /////////////////////////DMRS Modulation/////////////////////////
   ///////////
   pusch_dmrs = UE->nr_gold_pusch_dmrs[slot];
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index 21dc0d93dc..9c36ae740f 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -229,18 +229,22 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id
   uint8_t mapping_type;
   uint32_t G;
   int Nid_cell = 0; // [hna] shouldn't be a local variable (should be signaled)
+  uint16_t start_symbol, number_symbols;
 
   mapping_type = gNB->pusch_config.pusch_TimeDomainResourceAllocation[0]->mappingType;
   gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->nb_re_dmrs = 0;
 
-  for (l = 0; l < NR_SYMBOLS_PER_SLOT; l++)
+  start_symbol = nfapi_ulsch_pdu_rel15->start_symbol;
+  number_symbols = nfapi_ulsch_pdu_rel15->number_symbols;
+
+  for (l = start_symbol; l < start_symbol + number_symbols; l++)
       number_dmrs_symbols += is_dmrs_symbol(l,
                                             0,
                                             0,
                                             0,
                                             0,
                                             0,
-                                            nfapi_ulsch_pdu_rel15->number_symbols,
+                                            number_symbols,
                                             &gNB->dmrs_UplinkConfig,
                                             mapping_type,
                                             frame_parms->ofdm_symbol_size);
@@ -248,7 +252,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id
   gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->nb_re_dmrs = ((gNB->dmrs_UplinkConfig.pusch_dmrs_type == pusch_dmrs_type1)?6:4)*number_dmrs_symbols;
 
   G = nr_get_G(nfapi_ulsch_pdu_rel15->number_rbs,
-               nfapi_ulsch_pdu_rel15->number_symbols,
+               number_symbols,
                gNB->ulsch[UE_id][0]->harq_processes[harq_pid]->nb_re_dmrs,
                nfapi_ulsch_pdu_rel15->length_dmrs,
                nfapi_ulsch_pdu_rel15->Qm,
@@ -274,7 +278,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id
                     gNB->pusch_vars[UE_id]->llr,
                     frame_parms,
                     frame_rx,
-                    nfapi_ulsch_pdu_rel15->number_symbols,
+                    number_symbols,
                     slot_rx,
                     harq_pid,
                     0);