Skip to content

O
OpenXG-RAN
Commit bfcefd9f authored by Louis Adrien Dufrene's avatar Louis Adrien Dufrene
Browse files
Options

Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization

parents 9d5557f5 2f95d409
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 102 deletions
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @ bfcefd9f
...@@ -128,7 +128,6 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -128,7 +128,6 @@ rx_sdu(const module_id_t enb_mod_idP,
mac = RC.mac[enb_mod_idP]; mac = RC.mac[enb_mod_idP];
harq_pid = subframe2harqpid(&mac->common_channels[CC_idP], frameP, subframeP); harq_pid = subframe2harqpid(&mac->common_channels[CC_idP], frameP, subframeP);
UE_list = &mac->UE_list; UE_list = &mac->UE_list;
//ra = (RA_t *) &RC.mac[enb_mod_idP]->common_channels[CC_idP].ra[0];
ra = RC.mac[enb_mod_idP]->common_channels[CC_idP].ra; ra = RC.mac[enb_mod_idP]->common_channels[CC_idP].ra;
memset(rx_ces, 0, MAX_NUM_CE * sizeof(unsigned char)); memset(rx_ces, 0, MAX_NUM_CE * sizeof(unsigned char));
memset(rx_lcids, 0, NB_RB_MAX * sizeof(unsigned char)); memset(rx_lcids, 0, NB_RB_MAX * sizeof(unsigned char));
...@@ -141,7 +140,7 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -141,7 +140,7 @@ rx_sdu(const module_id_t enb_mod_idP,
if (opt_enabled == 1) { if (opt_enabled == 1) {
trace_pdu(DIRECTION_UPLINK, sduP, sdu_lenP, 0, WS_C_RNTI, current_rnti, frameP, subframeP, 0, 0); trace_pdu(DIRECTION_UPLINK, sduP, sdu_lenP, 0, WS_C_RNTI, current_rnti, frameP, subframeP, 0, 0);
LOG_D(OPT, "[eNB %d][ULSCH] Frame %d rnti %x with size %d\n", LOG_D(OPT, "[eNB %d][ULSCH] Frame %d rnti %x with size %d\n",
enb_mod_idP, enb_mod_idP,
frameP, frameP,
current_rnti, current_rnti,
...@@ -179,7 +178,6 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -179,7 +178,6 @@ rx_sdu(const module_id_t enb_mod_idP,
if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) { if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 0; UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 0;
// mac_eNB_rrc_ul_in_sync(enb_mod_idP, CC_idP, frameP, subframeP, UE_RNTI(enb_mod_idP, UE_id)); // replace UE_RNTI(enb_mod_idP, UE_id) by current_rnti ??
mac_eNB_rrc_ul_in_sync(enb_mod_idP, CC_idP, frameP, subframeP, current_rnti); mac_eNB_rrc_ul_in_sync(enb_mod_idP, CC_idP, frameP, subframeP, current_rnti);
} }
......
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