fixing compilation errors

openair1/PHY/NR_REFSIG/nr_gold.c

@@ -65,11 +65,7 @@ void nr_init_pdcch_dmrs(PHY_VARS_gNB* gNB, uint32_t Nid)
     for (uint8_t symb=0; symb<fp->symbols_per_slot; symb++) {
 
       reset = 1;
-<<<<<<< HEAD
-      x2 = ((1<<17) * (14*slot+symb+1) * ((Nid<<1)+1)) + (Nid<<1);
-=======
       x2 = ((1<<17) * (fp->symbols_per_slot*slot+symb+1) * ((Nid<<1)+1) + (Nid<<1));
->>>>>>> 3752a5f0a... generation of csi-rs sequence
 
       for (uint32_t n=0; n<NR_MAX_PDCCH_DMRS_INIT_LENGTH_DWORD; n++) {
         pdcch_dmrs[slot][symb][n] = lte_gold_generic(&x1, &x2, reset);

openair1/PHY/NR_TRANSPORT/nr_csi_rs.c

@@ -29,7 +29,7 @@ int nr_generate_csi_rs(uint32_t **gold_csi_rs,
                        int32_t** txdataF,
                        int16_t amp,
                        NR_DL_FRAME_PARMS frame_parms,
-                       nfapi_nr_csi_rs_pdu_t csi_params)
+                       nfapi_nr_dl_tti_csi_rs_pdu_rel15_t csi_params)
 {
 
   int16_t mod_csi[frame_parms.symbols_per_slot][NR_MAX_CSI_RS_LENGTH>>1];

openair1/PHY/NR_TRANSPORT/nr_transport_proto.h

@@ -327,9 +327,10 @@ void init_prach_ru_list(RU_t *ru);
 void free_nr_ru_prach_entry(RU_t *ru, int prach_id);
 
 int nr_generate_csi_rs(uint32_t **gold_csi_rs,
-                       int32_t *txdataF,
+                       int32_t **txdataF,
+                       int16_t amp,
                        NR_DL_FRAME_PARMS frame_parms,
-                       nfapi_nr_csi_rs_pdu_t csi_params);
+                       nfapi_nr_dl_tti_csi_rs_pdu_rel15_t csi_params);
 
 void nr_decode_pucch1(int32_t **rxdataF,
                       pucch_GroupHopping_t pucch_GroupHopping,