From e0986d2de3df653198fb6d2bdb6660019631b1b9 Mon Sep 17 00:00:00 2001 From: Francesco Mani Date: Thu, 4 Apr 2019 18:01:13 +0200 Subject: [PATCH] removing my trashed frames --- openair1/PHY/defs_nr_UE.h | 2 -- openair1/SCHED_NR_UE/phy_procedures_nr_ue.c | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h index 53c21c726e..9270a96d95 100644 --- a/openair1/PHY/defs_nr_UE.h +++ b/openair1/PHY/defs_nr_UE.h @@ -913,8 +913,6 @@ typedef struct { NR_DL_FRAME_PARMS frame_parms_before_ho; NR_UE_COMMON common_vars; - int16_t trashed_frames; - nr_ue_if_module_t *if_inst; nr_downlink_indication_t dl_indication; diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c index 2638b2481b..2821c61a7f 100644 --- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c +++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c @@ -2835,7 +2835,6 @@ void nr_ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t * if (ret==0) { - ue->trashed_frames = 0; ue->pbch_vars[eNB_id]->pdu_errors_conseq = 0; @@ -4314,7 +4313,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN NR_UE_PDCCH *pdcch_vars = ue->pdcch_vars[ue->current_thread_id[nr_tti_rx]][0]; uint16_t nb_symb_sch = 9; // to be updated by higher layer uint8_t nb_symb_pdcch = pdcch_vars->coreset[0].duration; - uint8_t ssb_periodicity = ue->ssb_periodicity; // initialized to 20ms in nr_init_ue and never changed for now + uint8_t ssb_periodicity = 10; //ue->ssb_periodicity; // initialized to 20ms in nr_init_ue and never changed for now uint8_t ssb_frame_periodicity; uint8_t dci_cnt = 0; @@ -4465,12 +4464,10 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN ssb_frame_periodicity = ssb_periodicity/10 ; // 10ms is the frame length - frame_rx += ue->trashed_frames; int ssb_slot = (pbch_config.ssb_index)/2; - - // looking for pbch only in frames according to ssb periodicity - if ((ue->decode_MIB == 1) && (nr_tti_rx == ssb_slot) )//&& !((frame_rx-(pbch_config.system_frame_number))%ssb_frame_periodicity)) + // looking for pbch only in frames according to ssb periodicity and in slot where decoded ssb is found + if ((ue->decode_MIB == 1) && (nr_tti_rx == ssb_slot) && !((frame_rx-(pbch_config.system_frame_number))%ssb_frame_periodicity)) { LOG_D(PHY," ------ PBCH ChannelComp/LLR: frame.slot %d.%d ------ \n", frame_rx%1024, nr_tti_rx);