Merge branch 'develop' into NR_FAPI_beamindex_SSB_RO

Fixed merge conflicts.
2021-01-19 20:58:10 +01:00
parent af4242b508 951fdfef7e
commit b8795d3824
108 changed files with 3649 additions and 1907 deletions
@@ -394,6 +394,11 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
  // This schedules MIB
  schedule_nr_mib(module_idP, frame, slot, nr_slots_per_frame[*scc->ssbSubcarrierSpacing],nb_periods_per_frame);

+  // This schedules SIB1
+  if ( get_softmodem_params()->sa == 1 )
+    schedule_nr_sib1(module_idP, frame, slot);
+
+
  // This schedule PRACH if we are not in phy_test mode
  if (get_softmodem_params()->phy_test == 0) {
    /* we need to make sure that resources for PRACH are free. To avoid that