Removed unrequired nsa conditions.

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -614,8 +614,6 @@ int nr_ue_process_dci_indication_pdu(module_id_t module_id,int cc_id, int gNB_in
     def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dci->dci_format];
   }
   int8_t ret_proc = nr_ue_process_dci(module_id, cc_id, gNB_index, frame, slot, def_dci_pdu_rel15, dci);
-  if (!get_softmodem_params()->nsa)
-    memset(def_dci_pdu_rel15, 0, sizeof(dci_pdu_rel15_t));
   return ret_proc;
 }
 

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -961,8 +961,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
       uint8_t ulsch_input_buffer[MAX_ULSCH_PAYLOAD_BYTES];
       nr_scheduled_response_t scheduled_response;
       fapi_nr_tx_request_t tx_req;
-      if (get_softmodem_params()->nsa)
-        memset(&tx_req, 0, sizeof(tx_req));
+      memset(&tx_req, 0, sizeof(tx_req));
 
       for (int j = 0; j < ul_config->number_pdus; j++) {
 
@@ -2184,17 +2183,10 @@ void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t s
 
   NR_UE_MAC_INST_t *mac = get_mac_inst(module_idP);
   RA_config_t *ra = &mac->ra;
-
-  fapi_nr_ul_config_request_t *ul_config;
-  if (get_softmodem_params()->nsa) {
-    ul_config = get_ul_config_request(mac, slotP);
-    if (!ul_config) {
-      LOG_E(NR_MAC, "mac->ul_config is null! \n");
-      return;
-    }
-  }
-  else {
-    ul_config = &mac->ul_config_request[0];
+  fapi_nr_ul_config_request_t *ul_config = get_ul_config_request(mac, slotP);
+  if (!ul_config) {
+    LOG_E(NR_MAC, "mac->ul_config is null! \n");
+    return;
   }
 
   fapi_nr_ul_config_prach_pdu *prach_config_pdu;

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -176,7 +176,7 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
 
       case NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE: {
         const nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_pdu = &uci_list[i].pucch_pdu_format_0_1;
-        LOG_I(NR_MAC, "The received uci has sfn slot %d %d, num_ucis %d and pdu_size %d\n",
+        LOG_D(NR_MAC, "The received uci has sfn slot %d %d, num_ucis %d and pdu_size %d\n",
                 UL_INFO.uci_ind.sfn, UL_INFO.uci_ind.slot, num_ucis, uci_list[i].pdu_size);
         handle_nr_uci_pucch_0_1(mod_id, frame, slot, uci_pdu);
         break;

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -876,8 +876,7 @@ int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, frame_t
 // Note: sdu should always be processed because data and timing advance updates are transmitted by the UE
 int8_t handle_dlsch(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment, int pdu_id){
 
-  if (get_softmodem_params()->nsa)
-    dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.harq_pid = g_harq_pid;
+  dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.harq_pid = g_harq_pid;
   update_harq_status(dl_info, pdu_id);
 
   if(dl_info->rx_ind->rx_indication_body[pdu_id].pdsch_pdu.ack_nack)
@@ -951,14 +950,10 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
                                 dl_info->slot,
                                 dl_info->dci_ind->dci_list+i);
 
-        if (get_softmodem_params()->nsa)
-        {
-          fapi_nr_dci_indication_pdu_t *dci_index = dl_info->dci_ind->dci_list+i;
-          dci_pdu_rel15_t *def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dci_index->dci_format];
-          g_harq_pid = def_dci_pdu_rel15->harq_pid;
-          LOG_D(NR_MAC, "Setting harq_pid = %d and dci_index = %d (based on format)\n", g_harq_pid, dci_index->dci_format);
-          memset(def_dci_pdu_rel15, 0, sizeof(*def_dci_pdu_rel15));
-        }
+        fapi_nr_dci_indication_pdu_t *dci_index = dl_info->dci_ind->dci_list+i;
+        dci_pdu_rel15_t *def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dci_index->dci_format];
+        g_harq_pid = def_dci_pdu_rel15->harq_pid;
+        LOG_D(NR_MAC, "Setting harq_pid = %d and dci_index = %d (based on format)\n", g_harq_pid, dci_index->dci_format);
 
         ret_mask |= (ret << FAPI_NR_DCI_IND);
         if (ret >= 0) {
@@ -967,7 +962,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
           fill_scheduled_response(&scheduled_response, dl_config, NULL, NULL, dl_info->module_id, dl_info->cc_id, dl_info->frame, dl_info->slot, dl_info->thread_id);
           nr_ue_if_module_inst[module_id]->scheduled_response(&scheduled_response);
         }
-        
+        memset(def_dci_pdu_rel15, 0, sizeof(*def_dci_pdu_rel15));
       }
       free(dl_info->dci_ind);
       dl_info->dci_ind = NULL;