From 626693fc324862bb56bc0ef40202eacccc4ab4ff Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Thu, 20 Oct 2016 12:06:45 +0300 Subject: [PATCH] lte: s/Periocity/Periodicity/ --- src/lte/model/lte-ue-phy.cc | 12 ++++++------ src/lte/model/lte-ue-phy.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index 552b7ab7e..a674f8f10 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -141,8 +141,8 @@ LteUePhy::LteUePhy () LteUePhy::LteUePhy (Ptr dlPhy, Ptr ulPhy) : LtePhy (dlPhy, ulPhy), - m_p10CqiPeriocity (MilliSeconds (1)), // ideal behavior - m_a30CqiPeriocity (MilliSeconds (1)), // ideal behavior + m_p10CqiPeriodicity (MilliSeconds (1)), // ideal behavior + m_a30CqiPeriodicity (MilliSeconds (1)), // ideal behavior m_uePhySapUser (0), m_ueCphySapUser (0), m_state (CELL_SEARCH), @@ -487,7 +487,7 @@ LteUePhy::GenerateCqiRsrpRsrq (const SpectrumValue& sinr) if (m_dlConfigured && m_ulConfigured && (m_rnti > 0)) { // check periodic wideband CQI - if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity) + if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriodicity) { Ptr thisDevice = GetDevice ()->GetObject (); Ptr msg = CreateDlCqiFeedbackMessage (sinr); @@ -498,7 +498,7 @@ LteUePhy::GenerateCqiRsrpRsrq (const SpectrumValue& sinr) m_p10CqiLast = Simulator::Now (); } // check aperiodic high-layer configured subband CQI - if (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriocity) + if (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriodicity) { Ptr thisDevice = GetDevice ()->GetObject (); Ptr msg = CreateDlCqiFeedbackMessage (sinr); @@ -710,7 +710,7 @@ LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr) Ptr msg = Create (); CqiListElement_s dlcqi; std::vector cqi; - if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity) + if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriodicity) { cqi = m_amc->CreateCqiFeedbacks (newSinr, m_dlBandwidth); @@ -749,7 +749,7 @@ LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr) dlcqi.m_wbPmi = 0; // not yet used // dl.cqi.m_sbMeasResult others CQI report modes: not yet implemented } - else if (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriocity) + else if (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriodicity) { cqi = m_amc->CreateCqiFeedbacks (newSinr, GetRbgSize ()); int nLayer = TransmissionModesLayers::TxMode2LayerNum (m_transmissionMode); diff --git a/src/lte/model/lte-ue-phy.h b/src/lte/model/lte-ue-phy.h index ad33a63a1..b049ec9a4 100644 --- a/src/lte/model/lte-ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -345,7 +345,7 @@ private: Ptr m_powerControl; /// Wideband Periodic CQI. 2, 5, 10, 16, 20, 32, 40, 64, 80 or 160 ms. - Time m_p10CqiPeriocity; + Time m_p10CqiPeriodicity; Time m_p10CqiLast; /** @@ -353,7 +353,7 @@ private: * Grant. * \note Defines a periodicity for academic studies. */ - Time m_a30CqiPeriocity; + Time m_a30CqiPeriodicity; Time m_a30CqiLast; LteUePhySapProvider* m_uePhySapProvider;