From 1c2c853b8ec95e4d1e6a68e267018fb1745ec38c Mon Sep 17 00:00:00 2001
From: Guy De Souza <desouza@eurecom.fr>
Date: Mon, 29 Oct 2018 12:21:32 +0100
Subject: [PATCH] DCI alloc fix

---
 openair1/PHY/NR_TRANSPORT/nr_dlsch.c        | 2 +-
 openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c | 2 +-
 openair1/SCHED_NR/phy_procedures_nr_gNB.c   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index 7849a533d9..6087e92b37 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -34,7 +34,7 @@
 #include "nr_dci.h"
 #include "nr_sch_dmrs.h"
 
-#define DEBUG_DLSCH
+//#define DEBUG_DLSCH
 
 uint8_t mod_order[5] = {1, 2, 4, 6, 8};
 uint16_t mod_offset[5] = {1,3,7,23,87};
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 2de2b724fd..9d1d7bfa90 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -152,7 +152,7 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(unsigned char Kmimo,unsigned char Mdlharq,uint32_t
      }
 
     for (i=0; i<10; i++)
-      dlsch->harq_ids[i] = i;
+      dlsch->harq_ids[i] = 0;
 
 
     for (i=0; i<Mdlharq; i++) {
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index 95657dc808..f0cde5634b 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -23,6 +23,7 @@
 #include "PHY/defs_gNB.h"
 #include "sched_nr.h"
 #include "PHY/NR_TRANSPORT/nr_transport.h"
+#include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "SCHED/sched_eNB.h"
 #include "SCHED/sched_common_extern.h"
 #include "nfapi_interface.h"
@@ -197,7 +198,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
       if (num_pdsch_rnti) {
         LOG_I(PHY, "PDSCH generation started (%d)\n", num_pdsch_rnti);
         nr_generate_pdsch(*gNB->dlsch[0][0],
-                          gNB->pdcch_vars,
+                          gNB->pdcch_vars.dci_alloc[0],
                           gNB->nr_gold_pdsch_dmrs[slot_idx],
                           gNB->common_vars.txdataF,
                           AMP, subframe, *fp, *cfg);