Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(2985)

Unified Diff: src/spectrum/model/half-duplex-ideal-phy.cc

Issue 6620057: Antenna/Orientation Support
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/spectrum/model/half-duplex-ideal-phy.h ('k') | src/spectrum/model/multi-model-spectrum-channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/spectrum/model/half-duplex-ideal-phy.cc
===================================================================
--- a/src/spectrum/model/half-duplex-ideal-phy.cc
+++ b/src/spectrum/model/half-duplex-ideal-phy.cc
@@ -242,20 +242,6 @@
m_phyMacRxEndOkCallback = c;
}
-Ptr<AntennaModel>
-HalfDuplexIdealPhy::GetRxAntenna ()
-{
- NS_LOG_FUNCTION (this);
- return m_antenna;
-}
-
-void
-HalfDuplexIdealPhy::SetAntenna (Ptr<AntennaModel> a)
-{
- NS_LOG_FUNCTION (this << a);
- m_antenna = a;
-}
-
void
HalfDuplexIdealPhy::ChangeState (State newState)
{
@@ -285,7 +271,8 @@
double txTimeSeconds = m_rate.CalculateTxTime (p->GetSize ());
txParams->duration = Seconds (txTimeSeconds);
txParams->txPhy = GetObject<SpectrumPhy> ();
- txParams->txAntenna = m_antenna;
+ Ptr<AntennaModel> ant = txParams->txPhy->GetObject<AntennaModel> ();
+ txParams->txAntenna = ant;
txParams->psd = m_txPsd;
txParams->data = m_txPacket;
« no previous file with comments | « src/spectrum/model/half-duplex-ideal-phy.h ('k') | src/spectrum/model/multi-model-spectrum-channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b