Fix numerology for CFRA at UE

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1146,7 +1146,7 @@ static void build_ro_list(NR_UE_MAC_INST_t *mac) {
   uint8_t format2 = 0xff;
   int nb_fdm;
 
-  uint8_t config_index, mu=get_softmodem_params()->numerology;
+  uint8_t config_index, mu;
   int msg1_FDM;
 
   uint8_t prach_conf_period_idx;
@@ -1161,6 +1161,14 @@ static void build_ro_list(NR_UE_MAC_INST_t *mac) {
 
   config_index = rach_ConfigGeneric->prach_ConfigurationIndex;
 
+  if (setup->msg1_SubcarrierSpacing) {
+    mu = *setup->msg1_SubcarrierSpacing;
+  } else if(mac->scc) {
+    mu = mac->scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing;
+  } else {
+    mu = get_softmodem_params()->numerology;
+  }
+
   msg1_FDM = rach_ConfigGeneric->msg1_FDM;
 
   switch (msg1_FDM){