Skip to content

O
OpenXG-RAN
Commit d2d0d617 authored by ChiehChun's avatar ChiehChun Committed by Robert Schmidt
Browse files
Options

Remove num_slots_per_tdd for UL

parent e42e5821
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 11 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @ d2d0d617
...@@ -446,7 +446,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, ...@@ -446,7 +446,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
// This schedules the DCI for Uplink and subsequently PUSCH // 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 // This schedules the DCI for Downlink and PDSCH
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @ d2d0d617
...@@ -375,7 +375,6 @@ void nr_preprocessor_phytest(module_id_t module_id, ...@@ -375,7 +375,6 @@ void nr_preprocessor_phytest(module_id_t module_id,
bool nr_ul_preprocessor_phytest(module_id_t module_id, bool nr_ul_preprocessor_phytest(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
uint64_t ulsch_in_slot_bitmap) { uint64_t ulsch_in_slot_bitmap) {
gNB_MAC_INST *nr_mac = RC.nrmac[module_id]; gNB_MAC_INST *nr_mac = RC.nrmac[module_id];
NR_COMMON_channels_t *cc = nr_mac->common_channels; NR_COMMON_channels_t *cc = nr_mac->common_channels;
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @ d2d0d617
...@@ -529,7 +529,6 @@ int bsr0ue = -1; ...@@ -529,7 +529,6 @@ int bsr0ue = -1;
void pf_ul(module_id_t module_id, void pf_ul(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
NR_list_t *UE_list, NR_list_t *UE_list,
int n_rb_sched, int n_rb_sched,
uint8_t *rballoc_mask, uint8_t *rballoc_mask,
...@@ -772,7 +771,6 @@ void pf_ul(module_id_t module_id, ...@@ -772,7 +771,6 @@ void pf_ul(module_id_t module_id,
bool nr_simple_ulsch_preprocessor(module_id_t module_id, bool nr_simple_ulsch_preprocessor(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
uint64_t ulsch_in_slot_bitmap) { uint64_t ulsch_in_slot_bitmap) {
gNB_MAC_INST *nr_mac = RC.nrmac[module_id]; gNB_MAC_INST *nr_mac = RC.nrmac[module_id];
NR_COMMON_channels_t *cc = nr_mac->common_channels; NR_COMMON_channels_t *cc = nr_mac->common_channels;
...@@ -842,7 +840,6 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id, ...@@ -842,7 +840,6 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id,
pf_ul(module_id, pf_ul(module_id,
frame, frame,
slot, slot,
num_slots_per_tdd,
&UE_info->list, &UE_info->list,
len, len,
rballoc_mask, rballoc_mask,
...@@ -853,7 +850,6 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id, ...@@ -853,7 +850,6 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id,
void nr_schedule_ulsch(module_id_t module_id, void nr_schedule_ulsch(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
int ul_slots, int ul_slots,
uint64_t ulsch_in_slot_bitmap) { uint64_t ulsch_in_slot_bitmap) {
/* Uplink data ONLY can be scheduled when the current slot is downlink slot, /* 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, ...@@ -863,7 +859,7 @@ void nr_schedule_ulsch(module_id_t module_id,
return; return;
} }
bool do_sched = RC.nrmac[module_id]->pre_processor_ul( 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) if (!do_sched)
return; return;
......
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @ d2d0d617
...@@ -89,14 +89,12 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t subfram ...@@ -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, void nr_schedule_ulsch(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
int ul_slots, int ul_slots,
uint64_t ulsch_in_slot_bitmap); uint64_t ulsch_in_slot_bitmap);
bool nr_simple_ulsch_preprocessor(module_id_t module_id, bool nr_simple_ulsch_preprocessor(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
uint64_t ulsch_in_slot_bitmap); uint64_t ulsch_in_slot_bitmap);
/////// Random Access MAC-PHY interface functions and primitives /////// /////// Random Access MAC-PHY interface functions and primitives ///////
...@@ -153,7 +151,6 @@ void nr_preprocessor_phytest(module_id_t module_id, ...@@ -153,7 +151,6 @@ void nr_preprocessor_phytest(module_id_t module_id,
bool nr_ul_preprocessor_phytest(module_id_t module_id, bool nr_ul_preprocessor_phytest(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
uint64_t ulsch_in_slot_bitmap); uint64_t ulsch_in_slot_bitmap);
void nr_schedule_css_dlsch_phytest(module_id_t module_idP, void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
......
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @ d2d0d617
...@@ -592,7 +592,6 @@ typedef void (*nr_pp_impl_dl)(module_id_t mod_id, ...@@ -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, typedef bool (*nr_pp_impl_ul)(module_id_t mod_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
int num_slots_per_tdd,
uint64_t ulsch_in_slot_bitmap); uint64_t ulsch_in_slot_bitmap);
/*! \brief top level eNB MAC structure */ /*! \brief top level eNB MAC structure */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment