Moved UE SSB/RO handling code from nr_mac_common to nr_ue_procedures

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h

@@ -120,9 +120,6 @@ void find_monitoring_periodicity_offset_common(NR_SearchSpace_t *ss,
                                                uint16_t *slot_period,
                                                uint16_t *offset);
 
-void build_ssb_to_ro_map(NR_ServingCellConfigCommon_t *scc, uint8_t unpaired);
-int get_nr_prach_info_from_ssb_index(uint8_t ssb_idx, int frame, int slot, prach_occasion_info_t **prach_occasion_info_pp);
-
 int get_nr_prach_info_from_index(uint8_t index,
                                  int frame,
                                  int slot,
@@ -166,6 +163,10 @@ int ul_ant_bits(NR_DMRS_UplinkConfig_t *NR_DMRS_UplinkConfig,long transformPreco
 
 int get_format0(uint8_t index, uint8_t unpaired);
 
+int64_t *get_prach_config_info(uint32_t pointa,
+                               uint8_t index,
+                               uint8_t unpaired);
+
 uint16_t get_NCS(uint8_t index, uint16_t format, uint8_t restricted_set_config);
 
 int get_num_dmrs(uint16_t dmrs_mask );

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -306,5 +306,8 @@ void get_num_re_dmrs(nfapi_nr_ue_pusch_pdu_t *pusch_pdu,
                      uint8_t *nb_dmrs_re_per_rb,
                      uint16_t *number_dmrs_symbols);
 
+void build_ssb_to_ro_map(NR_ServingCellConfigCommon_t *scc, uint8_t unpaired);
+
+
 #endif
 /** @}*/

openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c

@@ -274,15 +274,22 @@ uint16_t nr_ue_process_rar(module_id_t mod_id,
     if (ue_mac->RA_RAPID_found) {
 
       uint8_t freq_hopping, mcs, Msg3_t_alloc, Msg3_f_alloc;
-      unsigned char tpc_command, csi_req;
+      unsigned char tpc_command;
+#ifdef DEBUG_RAR
+      unsigned char csi_req;
+#endif
 
       // TC-RNTI
       *t_crnti = rar->TCRNTI_2 + (rar->TCRNTI_1 << 8);
       ue_mac->t_crnti = *t_crnti;
       // TA command
       ta_command = rar->TA2 + (rar->TA1 << 5);
+
+#ifdef DEBUG_RAR
       // CSI
       csi_req = (unsigned char) (rar->UL_GRANT_4 & 0x01);
+#endif
+
       // TPC
       tpc_command = (unsigned char) ((rar->UL_GRANT_4 >> 1) & 0x07);
       switch (tpc_command){