WIP: develop-nr is current as of 8.7.19
This commit is contained in:
+1
-1
@@ -1215,7 +1215,7 @@ static void *ru_thread_tx( void *param ) {
|
||||
|
||||
if(ru->if_south == LOCAL_RF)
|
||||
{
|
||||
uhd_set_thread_prio();
|
||||
//uhd_set_thread_prio();
|
||||
LOG_I(PHY,"set ru_thread_tx uhd priority");
|
||||
}
|
||||
|
||||
|
||||
+26
-22
@@ -350,39 +350,42 @@ static void UE_synch(void *arg) {
|
||||
}
|
||||
|
||||
void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
|
||||
|
||||
nr_dcireq_t dcireq;
|
||||
nr_scheduled_response_t scheduled_response;
|
||||
|
||||
// Process Rx data for one sub-frame
|
||||
if (slot_select_nr(&UE->frame_parms, proc->frame_tx, proc->nr_tti_tx) & NR_DOWNLINK_SLOT) {
|
||||
//clean previous FAPI MESSAGE
|
||||
UE->rx_ind.number_pdus = 0;
|
||||
UE->dci_ind.number_of_dcis = 0;
|
||||
//clean previous FAPI MESSAGE
|
||||
// call L2 for DL_CONFIG (DCI)
|
||||
UE->dcireq.module_id = UE->Mod_id;
|
||||
UE->dcireq.gNB_index = 0;
|
||||
UE->dcireq.cc_id = 0;
|
||||
UE->dcireq.frame = proc->frame_rx;
|
||||
UE->dcireq.slot = proc->nr_tti_rx;
|
||||
nr_ue_dcireq(&UE->dcireq); //to be replaced with function pointer later
|
||||
NR_UE_MAC_INST_t *UE_mac = get_mac_inst(0);
|
||||
UE_mac->scheduled_response.dl_config = &UE->dcireq.dl_config_req;
|
||||
UE_mac->scheduled_response.ul_config = NULL;
|
||||
UE_mac->scheduled_response.tx_request = NULL;
|
||||
UE_mac->scheduled_response.module_id = UE->Mod_id;
|
||||
UE_mac->scheduled_response.CC_id = 0;
|
||||
UE_mac->scheduled_response.frame = proc->frame_rx;
|
||||
UE_mac->scheduled_response.slot = proc->nr_tti_rx;
|
||||
nr_ue_scheduled_response(&UE_mac->scheduled_response);
|
||||
//write_output("uerxdata_frame.m", "uerxdata_frame", UE->common_vars.rxdata[0], UE->frame_parms.samples_per_frame, 1, 1);
|
||||
//TODO: all of this has to be moved to the MAC!!!
|
||||
dcireq.module_id = UE->Mod_id;
|
||||
dcireq.gNB_index = 0;
|
||||
dcireq.cc_id = 0;
|
||||
dcireq.frame = proc->frame_rx;
|
||||
dcireq.slot = proc->nr_tti_rx;
|
||||
nr_ue_dcireq(&dcireq); //to be replaced with function pointer later
|
||||
|
||||
scheduled_response.dl_config = &dcireq.dl_config_req;
|
||||
scheduled_response.ul_config = NULL;
|
||||
scheduled_response.tx_request = NULL;
|
||||
scheduled_response.module_id = UE->Mod_id;
|
||||
scheduled_response.CC_id = 0;
|
||||
scheduled_response.frame = proc->frame_rx;
|
||||
scheduled_response.slot = proc->nr_tti_rx;
|
||||
nr_ue_scheduled_response(&scheduled_response);
|
||||
|
||||
#ifdef UE_SLOT_PARALLELISATION
|
||||
phy_procedures_slot_parallelization_nrUE_RX( UE, proc, 0, 0, 1, UE->mode, no_relay, NULL );
|
||||
#else
|
||||
uint64_t a=rdtsc();
|
||||
phy_procedures_nrUE_RX( UE, proc, 0, 1, UE->mode, UE_mac->phy_config.config_req.pbch_config);
|
||||
phy_procedures_nrUE_RX( UE, proc, 0, 1, UE->mode);
|
||||
LOG_D(PHY,"phy_procedures_nrUE_RX: slot:%d, time %lu\n", proc->nr_tti_rx, (rdtsc()-a)/3500);
|
||||
//printf(">>> nr_ue_pdcch_procedures ended\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
// no UL for now
|
||||
/*
|
||||
if (UE->mac_enabled==1) {
|
||||
// trigger L2 to run ue_scheduler thru IF module
|
||||
// [TODO] mapping right after NR initial sync
|
||||
@@ -395,6 +398,7 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
|
||||
UE->if_inst->ul_indication(&UE->ul_indication);
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
Reference in New Issue
Block a user