Skip to content

O
OpenXG-RAN
Commit 0df70ddc authored by imad's avatar imad
Browse files
Options

modification on the slot location

parent 0025698c
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @ 0df70ddc
...@@ -403,7 +403,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, ...@@ -403,7 +403,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
} }
// This schedule SR // This schedule SR
nr_sr_reporting(module_idP, UE_id, slot, nr_slots_per_frame[*scc->ssbSubcarrierSpacing], frame); nr_sr_reporting(module_idP, UE_id, slot, nr_slots_per_frame[*scc->ssbSubcarrierSpacing], frame, num_slots_per_tdd, nr_ulmix_slots);
// This schedule CSI measurement reporting // This schedule CSI measurement reporting
if (UE_info->active[UE_id]) if (UE_info->active[UE_id])
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @ 0df70ddc
...@@ -628,7 +628,8 @@ uint16_t compute_pucch_prb_size(uint8_t format, ...@@ -628,7 +628,8 @@ uint16_t compute_pucch_prb_size(uint8_t format,
} }
void nr_sr_reporting (int Mod_idp, int UE_id,sub_frame_t slot, int n_slots_frame, frame_t SFN){ void nr_sr_reporting (int Mod_idp, int UE_id,sub_frame_t slot, int n_slots_frame, frame_t SFN, int slots_per_tdd,
int ul_slots){
NR_UE_info_t *UE_info = &RC.nrmac[Mod_idp]->UE_info; NR_UE_info_t *UE_info = &RC.nrmac[Mod_idp]->UE_info;
NR_PUCCH_ResourceSet_t *pucchresset; NR_PUCCH_ResourceSet_t *pucchresset;
...@@ -661,7 +662,7 @@ void nr_sr_reporting (int Mod_idp, int UE_id,sub_frame_t slot, int n_slots_frame ...@@ -661,7 +662,7 @@ void nr_sr_reporting (int Mod_idp, int UE_id,sub_frame_t slot, int n_slots_frame
if (((SFN*n_slots_frame)+slot-SR_offset)%SR_period ==0){ if (((SFN*n_slots_frame)+slot-SR_offset)%SR_period ==0){
NR_PUCCH_ResourceId_t *PucchResourceId = SchedulingRequestResourceConfig->resource; NR_PUCCH_ResourceId_t *PucchResourceId = SchedulingRequestResourceConfig->resource;
curr_pucch = &UE_info->UE_sched_ctrl[UE_id].sched_pucch[slot][0]; curr_pucch = &UE_info->UE_sched_ctrl[UE_id].sched_pucch[(slot%slots_per_tdd)-slots_per_tdd+ul_slots][0];
curr_pucch->sr_flag=true; curr_pucch->sr_flag=true;
curr_pucch->frame = SFN; curr_pucch->frame = SFN;
curr_pucch->ul_slot = slot; curr_pucch->ul_slot = slot;
......
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @ 0df70ddc
...@@ -432,14 +432,19 @@ int16_t ssb_index_from_prach(module_id_t module_idP, ...@@ -432,14 +432,19 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
void find_SSB_and_RO_available(module_id_t module_idP); void find_SSB_and_RO_available(module_id_t module_idP);
void nr_sr_reporting (int Mod_idp, void nr_sr_reporting (int Mod_idp,
int UE_id, int UE_id,
sub_frame_t slotP, sub_frame_t slotP,
int n_slots_frame, int n_slots_frame,
frame_t frameP); frame_t frameP,
int slots_per_tdd,
int ul_slots);
void periodicity__SRR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRecconf, void periodicity__SRR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRecconf,
int *period, int *period,
int *offset); int *offset);
#endif /*__LAYER2_NR_MAC_PROTO_H__*/ #endif /*__LAYER2_NR_MAC_PROTO_H__*/
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