diff --git a/executables/nr-ue.c b/executables/nr-ue.c index e72e2d49fc..9de58eb8e7 100644 --- a/executables/nr-ue.c +++ b/executables/nr-ue.c @@ -531,8 +531,10 @@ void UE_processing(void *arg) { ul_indication.module_id = mod_id; ul_indication.gNB_index = gNB_id; ul_indication.cc_id = CC_id; - ul_indication.frame = proc->frame_rx; - ul_indication.slot = proc->nr_tti_rx; + ul_indication.frame_rx = proc->frame_rx; + ul_indication.slot_rx = proc->nr_tti_rx; + ul_indication.frame_tx = proc->frame_tx; + ul_indication.slot_tx = proc->nr_tti_tx; UE->if_inst->ul_indication(&ul_indication); } } diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c index cea10ae08c..0d04a0ae93 100644 --- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c +++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c @@ -113,17 +113,17 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){ mac->dl_config_request.number_pdus = 0; // clean previous FAPI messages - ret = nr_ue_scheduler( - ul_info->module_id, - ul_info->gNB_index, - ul_info->cc_id, - ul_info->frame, - ul_info->slot, - ul_info->ssb_index, - 0, 0); // TODO check tx/rx frame/slot is need for NR version + ret = nr_ue_scheduler(ul_info->module_id, + ul_info->gNB_index, + ul_info->cc_id, + ul_info->frame_rx, + ul_info->slot_rx, + ul_info->ssb_index, + ul_info->frame_tx, + ul_info->slot_tx); - /*if (is_nr_UL_slot(mac->scc, ul_info->slot)) - nr_ue_prach_scheduler(module_id, ul_info->frame, ul_info->slot);*/ // WIP TbD set tx frame/slot + if (is_nr_UL_slot(mac->scc, ul_info->slot_tx)) + nr_ue_prach_scheduler(module_id, ul_info->frame_tx, ul_info->slot_tx); switch(ret){ case UE_CONNECTION_OK: diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h index 0784e71584..b7ddfc0c57 100755 --- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h +++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h @@ -87,9 +87,13 @@ typedef struct { /// component carrier id int cc_id; /// frame - frame_t frame; - /// slot - uint32_t slot; + frame_t frame_rx; + /// slot rx + uint32_t slot_rx; + /// frame tx + frame_t frame_tx; + /// slot tx + uint32_t slot_tx; /// ssb_index, if ssb is not present in current TTI, thie value set to -1 int ssb_index; /// dci reception indication structure