align with SpectrumPhy antenna model changes for ns-3.14

This commit is contained in:
Tom Henderson
2012-07-04 21:26:40 -07:00
parent f74b34aac2
commit 8f70c1a43f
2 changed files with 20 additions and 0 deletions

View File

@@ -209,6 +209,21 @@ LrWpanPhy::GetRxSpectrumModel () const
}
}
Ptr<AntennaModel>
LrWpanPhy::GetRxAntenna ()
{
return m_antenna;
}
void
LrWpanPhy::SetAntenna (Ptr<AntennaModel> a)
{
NS_LOG_FUNCTION (this << a);
m_antenna = a;
}
void
LrWpanPhy::StartRx (Ptr<SpectrumSignalParameters> spectrumRxParams)
{
@@ -330,6 +345,7 @@ LrWpanPhy::PdDataRequest (const uint32_t psduLength, Ptr<Packet> p)
txParams->duration = CalculateTxTime (p);
txParams->txPhy = GetObject<SpectrumPhy> ();
txParams->psd = m_txPsd;
txParams->txAntenna = m_antenna;
Ptr<PacketBurst> pb = CreateObject<PacketBurst> ();
pb->AddPacket (p);
txParams->packetBurst = pb;

View File

@@ -30,6 +30,7 @@
#include <ns3/spectrum-channel.h>
#include <ns3/spectrum-interference.h>
#include <ns3/spectrum-value.h>
#include <ns3/antenna-model.h>
#include <ns3/mobility-model.h>
#include <ns3/packet.h>
#include <ns3/nstime.h>
@@ -211,6 +212,8 @@ public:
Ptr<SpectrumChannel> GetChannel (void);
void SetDevice (Ptr<NetDevice> d);
Ptr<NetDevice> GetDevice ();
void SetAntenna (Ptr<AntennaModel> a);
Ptr<AntennaModel> GetRxAntenna ();
virtual Ptr<const SpectrumModel> GetRxSpectrumModel () const;
/**
@@ -386,6 +389,7 @@ private:
Ptr<MobilityModel> m_mobility;
Ptr<NetDevice> m_device;
Ptr<SpectrumChannel> m_channel;
Ptr<AntennaModel> m_antenna;
Ptr<SpectrumValue> m_txPsd;
Ptr<const SpectrumValue> m_rxPsd;
Ptr<const SpectrumValue> m_noise;