F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lte: s/Periocity/Periodicity/

Browse Source
This commit is contained in:
Alexander Krotov
2016-10-20 12:06:45 +03:00
parent d9ef56874d
commit 626693fc32
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lte/model/lte-ue-phy.cc
View File

@@ -141,8 +141,8 @@ LteUePhy::LteUePhy ()
LteUePhy::LteUePhy (Ptr<LteSpectrumPhy> dlPhy, Ptr<LteSpectrumPhy> 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<LteUeNetDevice> thisDevice = GetDevice ()->GetObject<LteUeNetDevice> ();
Ptr<DlCqiLteControlMessage> 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<LteUeNetDevice> thisDevice = GetDevice ()->GetObject<LteUeNetDevice> ();
Ptr<DlCqiLteControlMessage> msg = CreateDlCqiFeedbackMessage (sinr);
@@ -710,7 +710,7 @@ LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr)
Ptr<DlCqiLteControlMessage> msg = Create<DlCqiLteControlMessage> ();
CqiListElement_s dlcqi;
std::vector<int> 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);

4
src/lte/model/lte-ue-phy.h
View File

@@ -345,7 +345,7 @@ private:
Ptr<LteUePowerControl> 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;