Merge branch 'episys/david/nsa_integrated_RA' into eurecom-episys-merge-nsa

executables/nr-ue.c

@@ -354,24 +354,17 @@ static void check_nr_prach(NR_UE_MAC_INST_t *mac, nr_uplink_indication_t *ul_inf
     AssertFatal(ul_config->number_pdus < sizeof(ul_config->ul_config_list) / sizeof(ul_config->ul_config_list[0]),
                 "Number of PDUS in ul_config = %d > ul_config_list num elements", ul_config->number_pdus);
     fapi_nr_ul_config_prach_pdu *prach_pdu = &ul_config->ul_config_list[ul_config->number_pdus].prach_config_pdu;
-    uint8_t nr_prach = get_softmodem_params()->nsa ?
-                        nr_ue_get_rach_nsa(prach_resources,
-                                           prach_pdu,
-                                           ul_info->module_id,
-                                           ul_info->cc_id,
-                                           ul_info->frame_tx,
-                                           ul_info->gNB_index,
-                                           ul_info->slot_tx) :
-                        nr_ue_get_rach(prach_resources,
-                                       prach_pdu,
-                                       ul_info->module_id,
-                                       ul_info->cc_id,
-                                       ul_info->frame_tx,
-                                       ul_info->gNB_index,
-                                       ul_info->slot_tx);
+    uint8_t nr_prach = nr_ue_get_rach(prach_resources,
+                                      prach_pdu,
+                                      ul_info->module_id,
+                                      ul_info->cc_id,
+                                      ul_info->frame_tx,
+                                      ul_info->gNB_index,
+                                      ul_info->slot_tx);
     if (nr_prach == 1)
     {
       L1_nsa_prach_procedures(ul_info->frame_tx, ul_info->slot_tx, prach_pdu);
+      mac->ra.generate_nr_prach = GENERATE_PREAMBLE;
       ul_config->number_pdus = 0;
       ul_info->ue_sched_mode = SCHED_ALL;
     }

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -415,16 +415,6 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
                        uint8_t gNB_id,
                        int nr_slot_tx);
 
-uint8_t nr_ue_get_rach_nsa(NR_PRACH_RESOURCES_t *prach_resources,
-                       fapi_nr_ul_config_prach_pdu *prach_pdu,
-                       module_id_t mod_id,
-                       int CC_id,
-                       frame_t frame,
-                       uint8_t gNB_id,
-                       int nr_slot_tx);
-
-
-
 /* \brief Function implementing the routine for the selection of Random Access resources (5.1.2 TS 38.321).
 @param module_idP Index of UE instance
 @param CC_id Component Carrier Index