From 512e76dee85b89d4349e501378a76d219b601ad2 Mon Sep 17 00:00:00 2001
From: Melissa Elkadi <melissa@episci.com>
Date: Thu, 26 Aug 2021 17:37:51 -0700
Subject: [PATCH] Error checking and meas sending wait for EPC only

---
 openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c | 9 ++++-----
 openair2/RRC/LTE/rrc_UE.c                   | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index b8414e0baa..9b2ddc16e4 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -821,7 +821,6 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
 
 int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment){
 
-  int32_t i;
   uint32_t ret_mask = 0x0;
   module_id_t module_id = dl_info->module_id;
   NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
@@ -832,9 +831,9 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
     nr_ue_scheduler(dl_info, NULL);
   } else {
     // UL indication after reception of DCI or DL PDU
-    if(dl_info->dci_ind != NULL){
+    if (dl_info && dl_info->dci_ind && dl_info->dci_ind->number_of_dcis) {
       LOG_D(MAC,"[L2][IF MODULE][DL INDICATION][DCI_IND]\n");
-      for(i=0; i<dl_info->dci_ind->number_of_dcis; ++i){
+      for (int i = 0; i < dl_info->dci_ind->number_of_dcis; i++) {
         LOG_D(MAC,">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
         nr_scheduled_response_t scheduled_response;
         int8_t ret = handle_dci(dl_info->module_id,
@@ -854,9 +853,9 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
       }
     }
 
-    if(dl_info->rx_ind != NULL){
+    if (dl_info->rx_ind != NULL) {
 
-      for(i=0; i<dl_info->rx_ind->number_pdus; ++i){
+      for (int i=0; i<dl_info->rx_ind->number_pdus; ++i) {
 
         LOG_D(MAC, "In %s sending DL indication to MAC. 1 PDU type %d of %d total number of PDUs \n",
           __FUNCTION__,
diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c
index 94fe8bbee5..fb363aa097 100644
--- a/openair2/RRC/LTE/rrc_UE.c
+++ b/openair2/RRC/LTE/rrc_UE.c
@@ -4627,7 +4627,8 @@ void ue_measurement_report_triggering(protocol_ctxt_t *const ctxt_pP, const uint
             if (is_state_connected && is_t304_inactive && have_meas_flag) {
               LOG_I(RRC,"[UE %d] Frame %d: Triggering generation of Meas Report for NR_r15. count = %d\n",
                     ctxt_pP->module_id, ctxt_pP->frame, ue->subframeCount);
-              usleep(200000); //Melissa Elkadi come back for EPC
+              if (!SOFTMODEM_NOS1_BIT)
+                usleep(200000); //Melissa Elkadi come back for EPC
               if (ue->measReportList[i][j] == NULL) {
                 ue->measReportList[i][j] = malloc(sizeof(MEAS_REPORT_LIST));
               }