From 3387ea0361a7204e78a6e0eed184fa6be56ff24a Mon Sep 17 00:00:00 2001 From: ZorazeAli Date: Fri, 3 May 2019 11:28:06 +0200 Subject: [PATCH] lte: Correct typos --- src/lte/model/lte-enb-cmac-sap.h | 4 ++-- src/lte/model/lte-ue-phy.cc | 17 +++++++++-------- src/lte/model/lte-ue-phy.h | 4 ++-- src/lte/model/lte-ue-rrc.cc | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/lte/model/lte-enb-cmac-sap.h b/src/lte/model/lte-enb-cmac-sap.h index 993fc205c..3fdb3cb1b 100644 --- a/src/lte/model/lte-enb-cmac-sap.h +++ b/src/lte/model/lte-enb-cmac-sap.h @@ -225,9 +225,9 @@ public: * \brief Is random access completed function * * This method is executed to decide if the non contention based - * preamble has to reused or not upon preamble expiry. If the random access + * preamble has to be reused or not upon preamble expiry. If the random access * in connected mode is completed, then the preamble can be reused by other UEs. - * If not, the same UE retains the preamble and other available preambles is + * If not, the same UE retains the preamble and other available preambles are * assigned to the required UEs. * * \param rnti the C-RNTI identifying the user diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index fa3f7cb8c..19b0c4658 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -588,14 +588,14 @@ LteUePhy::GenerateCqiRsrpRsrq (const SpectrumValue& sinr) } double rsrp = (rbNum > 0) ? (sum / rbNum) : DBL_MAX; // averaged SINR among RBs - double avSinr = ComputeAvrgSinr (sinr); + double avSinr = ComputeAvgSinr (sinr); NS_LOG_INFO (this << " cellId " << m_cellId << " rnti " << m_rnti << " RSRP " << rsrp << " SINR " << avSinr << " ComponentCarrierId " << (uint16_t) m_componentCarrierId); //trigger RLF detection only when UE has an active RRC connection //and RLF detection attribute is set to true if (m_isConnected && m_enableRlfDetection) { - double avrgSinrForRlf = ComputeAvrgSinr (m_ctrlSinrForRlf); + double avrgSinrForRlf = ComputeAvgSinr (m_ctrlSinrForRlf); RlfDetection (10 * log10 (avrgSinrForRlf)); } @@ -659,7 +659,7 @@ LteUePhy::GenerateCqiRsrpRsrq (const SpectrumValue& sinr) } // end of void LteUePhy::GenerateCtrlCqiReport (const SpectrumValue& sinr) double -LteUePhy::ComputeAvrgSinr (const SpectrumValue& sinr) +LteUePhy::ComputeAvgSinr (const SpectrumValue& sinr) { NS_LOG_FUNCTION (this); @@ -707,8 +707,8 @@ LteUePhy::GenerateMixedCqiReport (const SpectrumValue& sinr) NS_ASSERT (m_state != CELL_SEARCH); //NOTE: The SINR received by this method is //based on CTRL, which is not used to compute - //PDSCH (i.e., data) based SINR. Luckily, we can use - //it for RLF detection. + //PDSCH (i.e., data) based SINR. It is used + //for RLF detection. m_ctrlSinrForRlf = sinr; SpectrumValue mixedSinr = (m_rsReceivedPower * m_paLinear); @@ -1560,7 +1560,7 @@ LteUePhy::RlfDetection (double sinrDb) * than the threshold Qout, then the frame counter is reset * since only consecutive frames should be considered. */ - NS_LOG_INFO ("Reseting frame counter at phy. Current value = " << m_numOfFrames); + NS_LOG_INFO ("Resetting frame counter at phy. Current value = " << m_numOfFrames); m_numOfFrames = 0; // Also reset the sync indicator counter at RRC m_ueCphySapUser->ResetSyncIndicationCounter (); @@ -1569,8 +1569,9 @@ LteUePhy::RlfDetection (double sinrDb) m_sinrDbFrame = 0; } /** - * Once the number of consecutive frames which cannot be decoded equals the Qout evaluation period (i.e 200ms), - * then an out-of-sync indication is sent to the RRC layer + * Once the number of consecutive frames which cannot be decoded equals + * the Qout evaluation period (i.e 200ms), then an out-of-sync indication + * is sent to the RRC layer */ if (m_downlinkInSync && (m_numOfFrames * 10) == m_numOfQoutEvalSf) { diff --git a/src/lte/model/lte-ue-phy.h b/src/lte/model/lte-ue-phy.h index d49aff23a..c7820f4b4 100644 --- a/src/lte/model/lte-ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -500,7 +500,7 @@ private: /** * \brief Reset radio link failure parameters * - * Upon receiving N311 in-sync indications from the UE + * Upon receiving N311 in Sync indications from the UE * PHY, the UE RRC instructs the UE PHY to reset the * RLF parameters so, it can start RLF detection again. * @@ -567,7 +567,7 @@ private: * \param sinr * \return the average SINR value */ - double ComputeAvrgSinr (const SpectrumValue& sinr); + double ComputeAvgSinr (const SpectrumValue& sinr); // UE PHY SAP methods virtual void DoSendMacPdu (Ptr p); diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc index 88b7f6e60..a8ac1dcdd 100644 --- a/src/lte/model/lte-ue-rrc.cc +++ b/src/lte/model/lte-ue-rrc.cc @@ -319,7 +319,7 @@ LteUeRrc::GetTypeId (void) MakeTraceSourceAccessor (&LteUeRrc::m_radioLinkFailureTrace), "ns3::LteUeRrc::ImsiCidRntiTracedCallback") .AddTraceSource ("PhySyncDetection", - "trace fired upon failure of radio link", + "trace fired upon receiving in Sync or out of Sync indications from UE PHY", MakeTraceSourceAccessor (&LteUeRrc::m_phySyncDetectionTrace), "ns3::LteUeRrc::PhySyncDetectionTracedCallback") ;