Remove num_slots_per_tdd for UL

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -446,7 +446,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, num_slots_per_tdd, nr_ulmix_slots, ulsch_in_slot_bitmap);
+    nr_schedule_ulsch(module_idP, frame, slot, nr_ulmix_slots, ulsch_in_slot_bitmap);
   }
 
   // This schedules the DCI for Downlink and PDSCH

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -375,7 +375,6 @@ void nr_preprocessor_phytest(module_id_t module_id,
 bool nr_ul_preprocessor_phytest(module_id_t module_id,
                                 frame_t frame,
                                 sub_frame_t slot,
-                                int num_slots_per_tdd,
                                 uint64_t ulsch_in_slot_bitmap) {
   gNB_MAC_INST *nr_mac = RC.nrmac[module_id];
   NR_COMMON_channels_t *cc = nr_mac->common_channels;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -529,7 +529,6 @@ int bsr0ue = -1;
 void pf_ul(module_id_t module_id,
            frame_t frame,
            sub_frame_t slot,
-           int num_slots_per_tdd,
            NR_list_t *UE_list,
            int n_rb_sched,
            uint8_t *rballoc_mask,
@@ -772,7 +771,6 @@ void pf_ul(module_id_t module_id,
 bool nr_simple_ulsch_preprocessor(module_id_t module_id,
                                   frame_t frame,
                                   sub_frame_t slot,
-                                  int num_slots_per_tdd,
                                   uint64_t ulsch_in_slot_bitmap) {
   gNB_MAC_INST *nr_mac = RC.nrmac[module_id];
   NR_COMMON_channels_t *cc = nr_mac->common_channels;
@@ -842,7 +840,6 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id,
   pf_ul(module_id,
         frame,
         slot,
-        num_slots_per_tdd,
         &UE_info->list,
         len,
         rballoc_mask,
@@ -853,7 +850,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 num_slots_per_tdd,
                        int ul_slots,
                        uint64_t ulsch_in_slot_bitmap) {
   /* Uplink data ONLY can be scheduled when the current slot is downlink slot,
@@ -863,7 +859,7 @@ void nr_schedule_ulsch(module_id_t module_id,
     return;
   }
   bool do_sched = RC.nrmac[module_id]->pre_processor_ul(
-      module_id, frame, slot, num_slots_per_tdd, ulsch_in_slot_bitmap);
+      module_id, frame, slot, ulsch_in_slot_bitmap);
   if (!do_sched)
     return;
 

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -89,14 +89,12 @@ 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 num_slots_per_tdd,
                        int ul_slots,
                        uint64_t ulsch_in_slot_bitmap);
 
 bool nr_simple_ulsch_preprocessor(module_id_t module_id,
                                   frame_t frame,
                                   sub_frame_t slot,
-                                  int num_slots_per_tdd,
                                   uint64_t ulsch_in_slot_bitmap);
 
 /////// Random Access MAC-PHY interface functions and primitives ///////
@@ -153,7 +151,6 @@ void nr_preprocessor_phytest(module_id_t module_id,
 bool nr_ul_preprocessor_phytest(module_id_t module_id,
                                 frame_t frame,
                                 sub_frame_t slot,
-                                int num_slots_per_tdd,
                                 uint64_t ulsch_in_slot_bitmap);
 
 void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -592,7 +592,6 @@ typedef void (*nr_pp_impl_dl)(module_id_t mod_id,
 typedef bool (*nr_pp_impl_ul)(module_id_t mod_id,
                               frame_t frame,
                               sub_frame_t slot,
-                              int num_slots_per_tdd,
                               uint64_t ulsch_in_slot_bitmap);
 
 /*! \brief top level eNB MAC structure */