maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UL PP can change retx freq allocation

Browse Source
This commit is contained in:
Robert Schmidt
2020-04-06 13:56:31 +02:00
parent 24fb5e9c80
commit 0f46f17c1c
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+23 -6
View File
@@ -1706,6 +1706,23 @@ schedule_ulsch_rnti(module_id_t module_idP,
} else if (rvidx_tab[round_UL & 3] == 3) { } else if (rvidx_tab[round_UL & 3] == 3) {
mcs_rv = 31; mcs_rv = 31;
} }
const uint16_t first_rb = UE_template_ptr->pre_first_nb_rb_ul;
const uint8_t nb_rb = UE_template_ptr->pre_allocated_nb_rb_ul;
if (first_rb != UE_template_ptr->first_rb_ul[harq_pid]
|| nb_rb != UE_template_ptr->nb_rb_ul[harq_pid])
LOG_D(MAC,
"%4d.%d UE %4x retx: change freq allocation to %d RBs start %d (from %d RBs start %d)\n",
frameP,
subframeP,
rnti,
nb_rb,
first_rb,
UE_template_ptr->nb_rb_ul[harq_pid],
UE_template_ptr->first_rb_ul[harq_pid]);
UE_template_ptr->first_rb_ul[harq_pid] = first_rb;
UE_template_ptr->nb_rb_ul[harq_pid] = nb_rb;
T(T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION, T(T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION,
T_INT(module_idP), T_INT(module_idP),
T_INT(CC_id), T_INT(CC_id),
@@ -1714,8 +1731,8 @@ schedule_ulsch_rnti(module_id_t module_idP,
T_INT(subframeP), T_INT(subframeP),
T_INT(harq_pid), T_INT(harq_pid),
T_INT(mcs_rv), T_INT(mcs_rv),
T_INT(UE_template_ptr->first_rb_ul[harq_pid]), T_INT(first_rb),
T_INT(UE_template_ptr->nb_rb_ul[harq_pid]), T_INT(nb_rb),
T_INT(round_index)); T_INT(round_index));
/* Add UL_config PDUs */ /* Add UL_config PDUs */
LOG_D(MAC, LOG_D(MAC,
@@ -1738,8 +1755,8 @@ schedule_ulsch_rnti(module_id_t module_idP,
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.aggregation_level = aggregation; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.aggregation_level = aggregation;
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.rnti = rnti; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.rnti = rnti;
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.transmission_power = 6000; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.transmission_power = 6000;
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.resource_block_start = UE_template_ptr->first_rb_ul[harq_pid]; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.resource_block_start = first_rb;
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.number_of_resource_block = UE_template_ptr->nb_rb_ul[harq_pid]; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.number_of_resource_block = nb_rb;
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.mcs_1 = mcs_rv; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.mcs_1 = mcs_rv;
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.cyclic_shift_2_for_drms = cshift; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.cyclic_shift_2_for_drms = cshift;
hi_dci0_pdu->dci_pdu.dci_pdu_rel8.frequency_hopping_enabled_flag = 0; hi_dci0_pdu->dci_pdu.dci_pdu_rel8.frequency_hopping_enabled_flag = 0;
@@ -1776,8 +1793,8 @@ schedule_ulsch_rnti(module_id_t module_idP,
get_tmode(module_idP, CC_id, UE_id), get_tmode(module_idP, CC_id, UE_id),
mac->ul_handle, mac->ul_handle,
rnti, rnti,
UE_template_ptr->first_rb_ul[harq_pid], // resource_block_start first_rb, // resource_block_start
UE_template_ptr->nb_rb_ul[harq_pid], // number_of_resource_blocks nb_rb, // number_of_resource_blocks
mcs_rv, mcs_rv,
cshift, // cyclic_shift_2_for_drms cshift, // cyclic_shift_2_for_drms
0, // frequency_hopping_enabled_flag 0, // frequency_hopping_enabled_flag