fixed compilation error with g++-4.4
This commit is contained in:
@@ -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<uint8_t> (1,255))
|
||||
MakeUintegerAccessor (&LteEnbPhy::SetMacChDelay,
|
||||
&LteEnbPhy::GetMacChDelay),
|
||||
MakeUintegerChecker<uint8_t> ())
|
||||
;
|
||||
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<LteUePhy> phy)
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<Packet> p)
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<uint8_t> (1,255))
|
||||
MakeUintegerAccessor (&LteUePhy::SetMacChDelay,
|
||||
&LteUePhy::GetMacChDelay),
|
||||
MakeUintegerChecker<uint8_t> ())
|
||||
;
|
||||
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<Packet> p)
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user