diff --git a/src/lte/model/lte-enb-phy.cc b/src/lte/model/lte-enb-phy.cc index b3db73ed4..3a8270685 100644 --- a/src/lte/model/lte-enb-phy.cc +++ b/src/lte/model/lte-enb-phy.cc @@ -143,8 +143,9 @@ LteEnbPhy::GetTypeId (void) .AddAttribute ("MacToChannelDelay", "The delay in TTI units that occurs between a scheduling decision in the MAC and the actual start of the transmission by the PHY. This is intended to be used to model the latency of real PHY and MAC implementations.", UintegerValue (1), - MakeUintegerAccessor (&LteEnbPhy::m_macChTtiDelay), - MakeUintegerChecker (1,255)) + MakeUintegerAccessor (&LteEnbPhy::SetMacChDelay, + &LteEnbPhy::GetMacChDelay), + MakeUintegerChecker ()) ; return tid; } @@ -213,6 +214,19 @@ LteEnbPhy::GetNoiseFigure () const return m_noiseFigure; } +void +LteEnbPhy::SetMacChDelay (uint8_t delay) +{ + m_macChTtiDelay = delay; + m_packetBurstQueue.resize (delay); +} + +uint8_t +LteEnbPhy::GetMacChDelay (void) const +{ + return (m_macChTtiDelay); +} + bool LteEnbPhy::AddUePhy (uint16_t rnti, Ptr phy) { diff --git a/src/lte/model/lte-enb-phy.h b/src/lte/model/lte-enb-phy.h index bb8967a7f..380fc2cb2 100644 --- a/src/lte/model/lte-enb-phy.h +++ b/src/lte/model/lte-enb-phy.h @@ -85,6 +85,7 @@ public: */ double GetTxPower () const; + /** * \param pw the noise figure in dB */ @@ -95,6 +96,16 @@ public: */ double GetNoiseFigure () const; + /** + * \param delay the TTI delay between MAC and channel + */ + void SetMacChDelay (uint8_t delay); + + /** + * \returns the TTI delay between MAC and channel + */ + uint8_t GetMacChDelay (void) const; + /** * \brief Queue the MAC PDU to be sent * \param p the MAC PDU to sent diff --git a/src/lte/model/lte-phy.cc b/src/lte/model/lte-phy.cc index 0b8357b38..5158f9c83 100644 --- a/src/lte/model/lte-phy.cc +++ b/src/lte/model/lte-phy.cc @@ -232,21 +232,6 @@ LtePhy::GetRbgSize (void) const return m_rbgSize; } - -void -LtePhy::SetMacChDelay (uint8_t delay) -{ - m_macChTtiDelay = delay; - m_packetBurstQueue.resize (delay); -} - - -uint8_t -LtePhy::GetMacChDelay (void) -{ - return (m_macChTtiDelay); -} - void LtePhy::SetMacPdu (Ptr p) { diff --git a/src/lte/model/lte-phy.h b/src/lte/model/lte-phy.h index 889fa5cbd..3177d0dac 100644 --- a/src/lte/model/lte-phy.h +++ b/src/lte/model/lte-phy.h @@ -194,14 +194,6 @@ public: */ uint8_t GetRbgSize (void) const; - /** - * \param delay the TTI delay between MAC and channel - */ - void SetMacChDelay (uint8_t delay); - /** - * \returns the TTI delay between MAC and channel - */ - uint8_t GetMacChDelay (void); /** * \param p queue MAC PDU to be sent diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index 7db63eb3f..269eb694e 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -155,8 +155,9 @@ LteUePhy::GetTypeId (void) .AddAttribute ("MacToChannelDelay", "The delay in TTI units that occurs between a scheduling decision in the MAC and the actual start of the transmission by the PHY. This is intended to be used to model the latency of real PHY and MAC implementations.", UintegerValue (1), - MakeUintegerAccessor (&LteUePhy::m_macChTtiDelay), - MakeUintegerChecker (1,255)) + MakeUintegerAccessor (&LteUePhy::SetMacChDelay, + &LteUePhy::GetMacChDelay), + MakeUintegerChecker ()) ; return tid; } @@ -212,6 +213,19 @@ LteUePhy::GetTxPower () const return m_txPower; } +void +LteUePhy::SetMacChDelay (uint8_t delay) +{ + m_macChTtiDelay = delay; + m_packetBurstQueue.resize (delay); +} + +uint8_t +LteUePhy::GetMacChDelay (void) const +{ + return (m_macChTtiDelay); +} + void LteUePhy::DoSendMacPdu (Ptr p) { diff --git a/src/lte/model/lte-ue-phy.h b/src/lte/model/lte-ue-phy.h index 8f9750418..a8be19087 100644 --- a/src/lte/model/lte-ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -101,6 +101,16 @@ public: */ double GetNoiseFigure () const; + /** + * \param delay the TTI delay between MAC and channel + */ + void SetMacChDelay (uint8_t delay); + + /** + * \returns the TTI delay between MAC and channel + */ + uint8_t GetMacChDelay (void) const; + /** * \brief Queue the MAC PDU to be sent * \param p the MAC PDU to sent