Remove nr_ulmix_slots

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -322,8 +322,6 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   gNB_MAC_INST *gNB = RC.nrmac[module_idP];
   NR_COMMON_channels_t *cc = gNB->common_channels;
   NR_ServingCellConfigCommon_t        *scc     = cc->ServingCellConfigCommon;
-  NR_TDD_UL_DL_Pattern_t *tdd_pattern = &scc->tdd_UL_DL_ConfigurationCommon->pattern1;
-  const int nr_ulmix_slots = tdd_pattern->nrofUplinkSlots + (tdd_pattern->nrofUplinkSymbols!=0);
 
   start_meas(&RC.nrmac[module_idP]->eNB_scheduler);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_DLSCH_ULSCH_SCHEDULER,VCD_FUNCTION_IN);
@@ -410,7 +408,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
 
   // This schedules the DCI for Uplink and subsequently PUSCH
   {
-    nr_schedule_ulsch(module_idP, frame, slot, nr_ulmix_slots, ulsch_in_slot_bitmap);
+    nr_schedule_ulsch(module_idP, frame, slot, ulsch_in_slot_bitmap);
   }
 
   // This schedules the DCI for Downlink and PDSCH

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -866,7 +866,6 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id,
 void nr_schedule_ulsch(module_id_t module_id,
                        frame_t frame,
                        sub_frame_t slot,
-                       int ul_slots,
                        uint64_t ulsch_in_slot_bitmap) {
   /* Uplink data ONLY can be scheduled when the current slot is downlink slot,
    * because we have to schedule the DCI0 first before schedule uplink data */

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -89,7 +89,6 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t subfram
 void nr_schedule_ulsch(module_id_t module_id,
                        frame_t frame,
                        sub_frame_t slot,
-                       int ul_slots,
                        uint64_t ulsch_in_slot_bitmap);
 
 bool nr_simple_ulsch_preprocessor(module_id_t module_id,