Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42

Conflicts:
	executables/nr-softmodem.c
	executables/nr-softmodem.h
	targets/ARCH/rfsimulator/simulator.c

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -74,6 +74,56 @@ int rrc_init_nr_global_param (void) {return(0);}
 void config_common(int Mod_idP,int CC_idP,int Nid_cell,int nr_bandP,uint64_t SSB_positions,uint16_t ssb_periodicity,uint64_t dl_CarrierFreqP,uint32_t dl_BandwidthP);
 int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id, const int CC_id, const uint8_t gNB_index,
                               const int8_t channel, const uint8_t* pduP, const sdu_size_t pdu_len) {return(0);}
+uint64_t get_softmodem_optmask(void) {return 0;}
+mac_rlc_status_resp_t mac_rlc_status_ind( const module_id_t       module_idP, const rnti_t            rntiP,
+										  const eNB_index_t       eNB_index,  const frame_t           frameP,
+										  const sub_frame_t 	  subframeP,  const eNB_flag_t        enb_flagP,
+										  const MBMS_flag_t       MBMS_flagP, const logical_chan_id_t channel_idP,
+										  const tb_size_t         tb_sizeP
+										  #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+										  ,const uint32_t sourceL2Id
+										  ,const uint32_t destinationL2Id
+										  #endif
+										){mac_rlc_status_resp_t  mac_rlc_status_resp; return mac_rlc_status_resp;}
+tbs_size_t mac_rlc_data_req(
+  const module_id_t       module_idP,
+  const rnti_t            rntiP,
+  const eNB_index_t       eNB_index,
+  const frame_t           frameP,
+  const eNB_flag_t        enb_flagP,
+  const MBMS_flag_t       MBMS_flagP,
+  const logical_chan_id_t channel_idP,
+  const tb_size_t         tb_sizeP,
+  char             *buffer_pP
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+  ,const uint32_t sourceL2Id
+  ,const uint32_t destinationL2Id
+#endif
+   )
+{return 0;}
+int generate_dlsch_header(unsigned char *mac_header,
+                          unsigned char num_sdus,
+                          unsigned short *sdu_lengths,
+                          unsigned char *sdu_lcids,
+                          unsigned char drx_cmd,
+                          unsigned short timing_advance_cmd,
+                          unsigned char *ue_cont_res_id,
+                          unsigned char short_padding,
+                          unsigned short post_padding){return 0;}
+void nr_ip_over_LTE_DRB_preconfiguration(void){}
+void mac_rlc_data_ind     (
+  const module_id_t         module_idP,
+  const rnti_t              rntiP,
+  const eNB_index_t         eNB_index,
+  const frame_t             frameP,
+  const eNB_flag_t          enb_flagP,
+  const MBMS_flag_t         MBMS_flagP,
+  const logical_chan_id_t   channel_idP,
+  char                     *buffer_pP,
+  const tb_size_t           tb_sizeP,
+  num_tb_t                  num_tbP,
+  crc_t                    *crcs_pP)
+{}
 
 // needed for some functions
 openair0_config_t openair0_cfg[MAX_CARDS];
@@ -710,7 +760,8 @@ int main(int argc, char **argv)
 
         }
 
-        if (UE_mac->dl_config_request.number_pdus == 0)
+        if (UE->dlsch[UE->current_thread_id[slot]][0][0]->last_iteration_cnt >= 
+	    UE->dlsch[UE->current_thread_id[slot]][0][0]->max_ldpc_iterations+1)
           n_errors++;
 
         //----------------------------------------------------------

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -69,6 +69,23 @@ uint16_t NB_UE_INST = 1;
 // dummy functions
 int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id, const int CC_id, const uint8_t gNB_index,
                               const int8_t channel, const uint8_t* pduP, const sdu_size_t pdu_len) { return 0; }
+void mac_rlc_data_ind     (
+  const module_id_t         module_idP,
+  const rnti_t              rntiP,
+  const eNB_index_t         eNB_index,
+  const frame_t             frameP,
+  const eNB_flag_t          enb_flagP,
+  const MBMS_flag_t         MBMS_flagP,
+  const logical_chan_id_t   channel_idP,
+  char                     *buffer_pP,
+  const tb_size_t           tb_sizeP,
+  num_tb_t                  num_tbP,
+  crc_t                    *crcs_pP)
+{}
+uint64_t get_softmodem_optmask(void) {return 0;}
+int rlc_module_init (void) {return(0);}
+void pdcp_layer_init (void) {}
+void nr_ip_over_LTE_DRB_preconfiguration(void){}
 
 // needed for some functions
 uint16_t n_rnti = 0x1234;