From a80f1cf2e73a968980d2efb71bb96be9bf0a747b Mon Sep 17 00:00:00 2001 From: hongzhi wang Date: Fri, 7 Sep 2018 17:04:41 +0200 Subject: [PATCH] ue clean more warnings --- openair1/PHY/INIT/nr_init_ue.c | 11 +++++++---- openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c | 15 +++++++++------ openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c | 1 - targets/RT/USER/nr-ue.c | 6 +++--- targets/RT/USER/nr-uesoftmodem.c | 14 +++++++------- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c index 29869e615b..151a917f23 100644 --- a/openair1/PHY/INIT/nr_init_ue.c +++ b/openair1/PHY/INIT/nr_init_ue.c @@ -327,6 +327,7 @@ void phy_config_sib13_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,int mbsfn_Area_ } } + void phy_config_meas_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index,uint8_t n_adj_cells,unsigned int *adj_cell_id) { @@ -344,6 +345,7 @@ void phy_config_meas_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index,uint8_t n memcpy((void*)phy_meas->adj_cell_id,(void *)adj_cell_id,n_adj_cells*sizeof(unsigned int)); } +*/ #if defined(Rel10) || defined(Rel14) void phy_config_dedicated_scell_ue(uint8_t Mod_id, @@ -355,17 +357,17 @@ void phy_config_dedicated_scell_ue(uint8_t Mod_id, } #endif - void phy_config_harq_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id, uint16_t max_harq_tx ) { - PHY_VARS_UE *phy_vars_ue = PHY_vars_UE_g[Mod_id][CC_id]; + PHY_VARS_NR_UE *phy_vars_ue = PHY_vars_UE_g[Mod_id][CC_id]; phy_vars_ue->ulsch[eNB_id]->Mlimit = max_harq_tx; } extern uint16_t beta_cqi[16]; +/* void phy_config_dedicated_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id, struct PhysicalConfigDedicated *physicalConfigDedicated ) { @@ -908,8 +910,9 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, return 0; } + /* -void nr_lte_ue_transport(PHY_VARS_UE *ue,int abstraction_flag) { +void init_nr_ue_transport(PHY_VARS_NR_UE *ue,int abstraction_flag) { int i,j,k; @@ -930,7 +933,7 @@ void nr_lte_ue_transport(PHY_VARS_UE *ue,int abstraction_flag) { ue->transmission_mode[i] = ue->frame_parms.nb_antenna_ports_eNB==1 ? 1 : 2; } - ue->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1; + //ue->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1; ue->dlsch_MCH[0] = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS_MBSFN,ue->frame_parms.N_RB_DL,0); diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c index e5ac340cce..095832128c 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c @@ -150,12 +150,12 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode) NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms; int ret=-1; - int aarx,rx_power=0; + int rx_power=0; //aarx, //nfapi_nr_config_request_t* config; /*offset parameters to be updated from higher layer */ - k_ssb =0; - N_ssb_crb = 0; + //k_ssb =0; + //N_ssb_crb = 0; /*#ifdef OAI_USRP __m128i *rxdata128; @@ -226,9 +226,12 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode) ret = nr_pbch_detection(ue,mode); nr_gold_pdcch(ue,0, 2); - nr_slot_fep(ue,0, 0, ue->rx_offset, 1, 1, NR_PDCCH_EST); - nr_slot_fep(ue,1, 0, ue->rx_offset, 1, 1, NR_PDCCH_EST); - + int nb_prefix_samples0 = frame_parms->nb_prefix_samples0; + frame_parms->nb_prefix_samples0 = 0; + + nr_slot_fep(ue,0, 0, ue->rx_offset, 0, 1, NR_PDCCH_EST); + nr_slot_fep(ue,1, 0, ue->rx_offset, 0, 1, NR_PDCCH_EST); + frame_parms->nb_prefix_samples0 = nb_prefix_samples0; LOG_I(PHY,"[UE %d] AUTOTEST Cell Sync : frame = %d, rx_offset %d, freq_offset %d \n", ue->Mod_id, diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c index 6ce7718199..337b6d8e33 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c @@ -394,7 +394,6 @@ void nr_pbch_unscrambling(NR_UE_PBCH *pbch, uint16_t length, uint8_t bitwise) { - int i; uint8_t reset, offset; uint32_t x1, x2, s=0; double *demod_pbch_e = pbch->demod_pbch_e; diff --git a/targets/RT/USER/nr-ue.c b/targets/RT/USER/nr-ue.c index fc8d44a236..04da3067c2 100644 --- a/targets/RT/USER/nr-ue.c +++ b/targets/RT/USER/nr-ue.c @@ -64,8 +64,8 @@ #include "T.h" extern double cpuf; -static nfapi_nr_config_request_t config_t; -static nfapi_nr_config_request_t* config =&config_t; +//static nfapi_nr_config_request_t config_t; +//static nfapi_nr_config_request_t* config =&config_t; /* * NR SLOT PROCESSING SEQUENCE @@ -810,7 +810,7 @@ void *UE_thread(void *arg) { PHY_VARS_NR_UE *UE = (PHY_VARS_NR_UE *) arg; // int tx_enabled = 0; int dummy_rx[UE->frame_parms.nb_antennas_rx][UE->frame_parms.samples_per_tti] __attribute__((aligned(32))); - openair0_timestamp timestamp,timestamp1; + openair0_timestamp timestamp; void* rxp[NB_ANTENNAS_RX], *txp[NB_ANTENNAS_TX]; int start_rx_stream = 0; int i; diff --git a/targets/RT/USER/nr-uesoftmodem.c b/targets/RT/USER/nr-uesoftmodem.c index 635fe524e3..54d169a171 100644 --- a/targets/RT/USER/nr-uesoftmodem.c +++ b/targets/RT/USER/nr-uesoftmodem.c @@ -1169,13 +1169,13 @@ int main( int argc, char **argv ) { if (do_forms==1) { fl_initialize (&argc, argv, NULL, 0, 0); - - //form_stats = create_form_stats_form(); - //fl_show_form (form_stats->stats_form, FL_PLACE_HOTSPOT, FL_FULLBORDER, "stats"); - UE_id = 0; - form_ue[UE_id] = create_lte_phy_scope_ue(); - sprintf (title, "LTE DL SCOPE UE"); - fl_show_form (form_ue[UE_id]->lte_phy_scope_ue, FL_PLACE_HOTSPOT, FL_FULLBORDER, title); + + form_stats = create_form_stats_form(); + fl_show_form (form_stats->stats_form, FL_PLACE_HOTSPOT, FL_FULLBORDER, "stats"); + UE_id = 0; + form_ue[UE_id] = create_lte_phy_scope_ue(); + sprintf (title, "NR DL SCOPE UE"); + fl_show_form (form_ue[UE_id]->lte_phy_scope_ue, FL_PLACE_HOTSPOT, FL_FULLBORDER, title); /* if (openair_daq_vars.use_ia_receiver) {