Continue correcting compilation errors

Info_on_merge.txt

@@ -12,8 +12,9 @@ nfapi/open-nFAPI/vnf/src/vnf_p7.c
 openair1/PHY/INIT/lte_init.c
 openair1/PHY/INIT/lte_init_ue.c
 openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
-openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c (Do not know which definition of lte_ul_channel_estimation() to use. It seems that
-                                                         both are needed: one for sidelink, one for normal Uplink. Done but not sure...)
+openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c (Do not know which definition of lte_ul_channel_estimation() to use.
+                                                         All the changes correspond to sidelink? Should it be modified to support both sidelink and  
+                                                         uplink now?)
 openair1/PHY/LTE_TRANSPORT/dci.c
 openair1/PHY/LTE_TRANSPORT/dci_tools.c
 openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
@@ -37,7 +38,8 @@ openair1/SCHED/phy_procedures_lte_eNb.c
 openair1/SCHED/sched_common.h (There are a lot of function definitions which are also in other header files and they differ. Not sure which one I 
                               should keep.)
 
-openair1/SCHED_UE/phy_procedures_lte_ue.c
+openair1/SCHED_UE/phy_procedures_lte_ue.c     (Should we keep ue->generate_ul_signal[][] or ue->generate_ul_signal[]? I guess the first.
+                                              In conflicting lines 1491-1497 I am not sure which version to keep.)
 openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c
 openair1/SIMULATION/LTE_PHY/dlsim.c
 openair2/COMMON/mac_rrc_primitives.h

openair1/PHY/INIT/lte_init.c

@@ -41,6 +41,7 @@ extern int32_t get_uldl_offset(int eutra_bandP);
 extern uint16_t prach_root_sequence_map0_3[838];
 extern uint16_t prach_root_sequence_map4[138];
 extern uint8_t nfapi_mode;
+uint8_t dmrs1_tab[8] = {0,2,3,4,6,8,9,10};
 
 
 int N_RB_DL_array[6] = {6,15,25,50,75,100};
@@ -723,7 +724,8 @@ void phy_config_dedicated_scell_eNB(uint8_t Mod_id,
 }
 */
 
-void  phy_config_cba_rnti (module_id_t Mod_id,int CC_id,eNB_flag_t eNB_flag, uint8_t index, rnti_t cba_rnti, uint8_t cba_group_id, uint8_t num_active_cba_groups)
+//The following function does not exist in develop branch anymore (01/2019), so not including it in the merge with sidelink
+/*void  phy_config_cba_rnti (module_id_t Mod_id,int CC_id,eNB_flag_t eNB_flag, uint8_t index, rnti_t cba_rnti, uint8_t cba_group_id, uint8_t num_active_cba_groups)
 {
   //   uint8_t i;
 
@@ -738,7 +740,7 @@ void  phy_config_cba_rnti (module_id_t Mod_id,int CC_id,eNB_flag_t eNB_flag, uin
     RC.eNB[Mod_id][CC_id]->ulsch[index]->cba_rnti[cba_group_id] = cba_rnti;
     //}
   }
-}
+}*/
 
 int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
                      unsigned char is_secondary_eNB,

openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c

@@ -48,7 +48,7 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
 				  int interpolate,
 				  uint16_t rnti) {
 
-
+	//int subframe = proc->subframe_rx;
 
   /*  int32_t **ul_ch_estimates=pusch_vars->drs_ch_estimates;
   int32_t **ul_ch_estimates_time=  pusch_vars->drs_ch_estimates_time;
@@ -293,7 +293,7 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
 #if T_TRACER
       if (aa == 0)
 	T(T_ENB_PHY_UL_CHANNEL_ESTIMATE, T_INT(0), T_INT(rnti),
-	  T_INT(frame_rx), T_INT(subframe),
+	  T_INT(frame_rx), T_INT(subframe_rx),
 	  T_INT(0), T_BUFFER(ul_ch_estimates_time[0], 512  * 4));
 #endif
     }

openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h

@@ -1454,7 +1454,7 @@ void fill_mdci_and_dlsch(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,mDCI_ALLOC_t *dc
 void fill_dci0(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_proc_t *proc,DCI_ALLOC_t *dci_alloc,
 	      nfapi_hi_dci0_dci_pdu *pdu);
 
-void fill_ulsch(PHY_VARS_eNB *eNB,nfapi_ul_config_ulsch_pdu *ulsch_pdu,int frame,int subframe);
+void fill_ulsch(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_ulsch_pdu *ulsch_pdu,int frame,int subframe);
 
 int32_t generate_eNB_dlsch_params_from_dci(int frame,
     uint8_t subframe,
@@ -1805,11 +1805,11 @@ uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms,
 uint8_t ul_subframe2pdcch_alloc_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n);
 
 
-int8_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type);
+int16_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type);
 
-int8_t find_ulsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type);
+int16_t find_ulsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type);
 
-int8_t find_uci(uint16_t rnti, int frame, int subframe, PHY_VARS_eNB *eNB,find_type_t type);
+int16_t find_uci(uint16_t rnti, int frame, int subframe, PHY_VARS_eNB *eNB,find_type_t type);
 
 int generate_slpss(int32_t **txdataF,
 		   short amp,

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -74,6 +74,8 @@ extern void add_subframe(uint16_t *frameP, uint16_t *subframeP, int offset);
 extern uint16_t sfnsf_add_subframe(uint16_t frameP, uint16_t subframeP, int offset);
 extern int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req);
 
+extern uint8_t nfapi_mode;
+
 // This table holds the allowable PRB sizes for ULSCH transmissions
 uint8_t rb_table[34] = {
   1, 2, 3, 4, 5, 6, 8, 9, 10, 12, 15, 16, 18, 20, 24, 25, 27, 30, 32,
@@ -649,7 +651,11 @@ rx_sdu(const module_id_t enb_mod_idP,
                 "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
                 enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
                 rx_lcids[i]);
-          mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL);  //(unsigned int*)crc_status);
+          mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL
+						#ifdef Rel14
+        		  	  	  ,SL_RESET_RLC_FLAG_NO
+						#endif
+          	  	  	  	  );  //(unsigned int*)crc_status);
           UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]] += 1;
           UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]] += rx_lengths[i];
         }
@@ -708,7 +714,11 @@ rx_sdu(const module_id_t enb_mod_idP,
             }
 
             if ((rx_lengths[i] < SCH_PAYLOAD_SIZE_MAX) && (rx_lengths[i] > 0)) {  // MAX SIZE OF transport block
-              mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL);
+              mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL
+								#ifdef Rel14
+        		  	  	  	  	  ,SL_RESET_RLC_FLAG_NO
+								#endif
+              	  	  	  	  );
               UE_list->eNB_UE_stats[CC_idP][UE_id].num_pdu_rx[rx_lcids[i]] += 1;
               UE_list->eNB_UE_stats[CC_idP][UE_id].num_bytes_rx[rx_lcids[i]] += rx_lengths[i];
               //clear uplane_inactivity_timer

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -958,15 +958,6 @@ pdcp_run (
 //-----------------------------------------------------------------------------
 {
 
-	// Not sure if we need this
-#if defined(ENABLE_ITTI)
-  MessageDef   *msg_p;
-  const char   *msg_name;
-  instance_t    instance;
-  int           result;
-  protocol_ctxt_t  ctxt;
-#endif
-  
   if (ctxt_pP->enb_flag) {
     start_meas(&eNB_pdcp_stats[ctxt_pP->module_id].pdcp_run);
   } else {

openair2/RRC/LTE/rrc_defs.h

@@ -769,7 +769,7 @@ typedef struct UE_RRC_INST_s {
   LTE_SystemInformationBlockType21_r14_t *sib21[NB_CNX_UE];
 
   LTE_SBCCH_SL_BCH_MessageType_t   SL_mib_tx;
-  LTE_SBCCH_SL_BCH_MessageType_t   mib_sl[NB_CNX_UE];
+  LTE_SBCCH_SL_BCH_MessageType_t   *mib_sl[NB_CNX_UE];
   uint8_t                           SL_MIB[5];
   /// Preconfiguration for Sidelink
   struct LTE_SL_Preconfiguration_r12 *SL_Preconfiguration[NB_CNX_UE];