From 817ea15e9c428e26441504a5b76707ff0f6dfaee Mon Sep 17 00:00:00 2001
From: Guy De Souza <desouza@eurecom.fr>
Date: Tue, 10 Jul 2018 15:51:43 +0200
Subject: [PATCH] Merge fixes ctd.

---
 openair1/PHY/INIT/nr_init.c                  | 2 +-
 openair1/PHY/NR_REFSIG/nr_gold.c             | 1 +
 openair1/PHY/NR_TRANSPORT/nr_dci.c           | 2 +-
 openair1/PHY/NR_TRANSPORT/nr_dci.h           | 4 ++--
 openair1/SCHED_NR/phy_procedures_nr_common.c | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index b6038d2792..b3025dbe00 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -34,7 +34,7 @@
 #include "assertions.h"
 #include <math.h>
 
-#include "PHY/NR_REFSIG/defs.h" 
+#include "PHY/NR_REFSIG/nr_refsig.h" 
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 
 extern uint32_t from_earfcn(int eutra_bandP,uint32_t dl_earfcn);
diff --git a/openair1/PHY/NR_REFSIG/nr_gold.c b/openair1/PHY/NR_REFSIG/nr_gold.c
index 28d1be3480..cad245ec84 100644
--- a/openair1/PHY/NR_REFSIG/nr_gold.c
+++ b/openair1/PHY/NR_REFSIG/nr_gold.c
@@ -28,6 +28,7 @@ void nr_init_pbch_dmrs(PHY_VARS_gNB* gNB)
   unsigned char Lmax, l, n_hf, N_hf;
   nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
+  uint8_t reset=1;
 
   Nid = cfg->sch_config.physical_cell_id.value;
 
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c
index 2ac6c405f0..fdd49a6350 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c
@@ -40,7 +40,7 @@ extern short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT];
 uint8_t nr_get_dci_size(nr_dci_format_e format,
                         nr_rnti_type_e rnti,
                         NR_BWP_PARMS* bwp,
-                        nfapi_config_request_t* config)
+                        nfapi_nr_config_request_t* config)
 {
   uint8_t size = 0;
   uint16_t N_RB = bwp->N_RB;
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.h b/openair1/PHY/NR_TRANSPORT/nr_dci.h
index 630e4781bb..f0c787c72a 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci.h
@@ -106,13 +106,13 @@ typedef unsigned __int128 uint128_t;
 uint8_t nr_get_dci_size(nr_dci_format_e format,
                         nr_rnti_type_e rnti,
                         NR_BWP_PARMS* bwp,
-                        nfapi_config_request_t* config);
+                        nfapi_nr_config_request_t* config);
 
 uint8_t nr_generate_dci_top(NR_gNB_DCI_ALLOC_t dci_alloc,
                             uint32_t *gold_pdcch_dmrs,
                             int32_t** txdataF,
                             int16_t amp,
                             NR_DL_FRAME_PARMS* frame_parms,
-                            nfapi_nr_config_request_t* config)
+                            nfapi_nr_config_request_t* config);
 
 #endif //__PHY_NR_TRANSPORT_DCI__H
diff --git a/openair1/SCHED_NR/phy_procedures_nr_common.c b/openair1/SCHED_NR/phy_procedures_nr_common.c
index e685888232..206d9ca03a 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_common.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_common.c
@@ -48,7 +48,7 @@ uint8_t nr_ss_first_symb_idx_type_0_mux1_FR1[8] = {0,0,1,2,1,2,1,2};
 
 
 
-nr_subframe_t nr_subframe_select(nfapi_config_request_t *cfg,unsigned char subframe)
+nr_subframe_t nr_subframe_select(nfapi_nr_config_request_t *cfg,unsigned char subframe)
 {
   if (cfg->subframe_config.duplex_mode.value == FDD)
     return(SF_DL);