removed LteSpectrumPhy's LtePhyRxDataEndErrorCallback

This commit is contained in:
Nicola Baldo
2015-04-01 15:47:34 +02:00
parent f2705e06cf
commit 3ea8979c01
3 changed files with 2 additions and 27 deletions

View File

@@ -57,6 +57,8 @@ us a note on ns-developers mailing list.</p>
</ul>
<h2>Changes to existing API:</h2>
<ul>
<li> In LteSpectrumPhy, LtePhyTxEndCallback and the corresponding methods have been removed, since they were unused.
</li>
</ul>
<h2>Changes to build system:</h2>
<ul>

View File

@@ -148,7 +148,6 @@ void LteSpectrumPhy::DoDispose ()
m_interferenceData = 0;
m_interferenceCtrl->Dispose ();
m_interferenceCtrl = 0;
m_ltePhyTxEndCallback = MakeNullCallback< void, Ptr<const Packet> > ();
m_ltePhyRxDataEndErrorCallback = MakeNullCallback< void > ();
m_ltePhyRxDataEndOkCallback = MakeNullCallback< void, Ptr<Packet> > ();
m_ltePhyRxCtrlEndOkCallback = MakeNullCallback< void, std::list<Ptr<LteControlMessage> > > ();
@@ -324,15 +323,6 @@ LteSpectrumPhy::Reset ()
}
void
LteSpectrumPhy::SetLtePhyTxEndCallback (LtePhyTxEndCallback c)
{
NS_LOG_FUNCTION (this);
m_ltePhyTxEndCallback = c;
}
void
LteSpectrumPhy::SetLtePhyRxDataEndErrorCallback (LtePhyRxDataEndErrorCallback c)
{
@@ -599,21 +589,7 @@ LteSpectrumPhy::EndTxData ()
NS_LOG_LOGIC (this << " state: " << m_state);
NS_ASSERT (m_state == TX);
m_phyTxEndTrace (m_txPacketBurst);
NS_ASSERT (m_ltePhyTxEndCallback.IsNull () == true);
if (!m_ltePhyTxEndCallback.IsNull ())
{
for (std::list<Ptr<Packet> >::const_iterator iter = m_txPacketBurst->Begin (); iter
!= m_txPacketBurst->End (); ++iter)
{
Ptr<Packet> packet = (*iter)->Copy ();
m_ltePhyTxEndCallback (packet);
}
}
m_txPacketBurst = 0;
ChangeState (IDLE);
}
@@ -626,7 +602,6 @@ LteSpectrumPhy::EndTxDlCtrl ()
NS_ASSERT (m_state == TX);
NS_ASSERT (m_txPacketBurst == 0);
NS_ASSERT (m_ltePhyTxEndCallback.IsNull () == true);
ChangeState (IDLE);
}
@@ -638,7 +613,6 @@ LteSpectrumPhy::EndTxUlSrs ()
NS_ASSERT (m_state == TX);
NS_ASSERT (m_txPacketBurst == 0);
NS_ASSERT (m_ltePhyTxEndCallback.IsNull () == true);
ChangeState (IDLE);
}

View File

@@ -455,7 +455,6 @@ private:
TracedCallback<Ptr<const Packet> > m_phyRxEndOkTrace;
TracedCallback<Ptr<const Packet> > m_phyRxEndErrorTrace;
LtePhyTxEndCallback m_ltePhyTxEndCallback;
LtePhyRxDataEndErrorCallback m_ltePhyRxDataEndErrorCallback;
LtePhyRxDataEndOkCallback m_ltePhyRxDataEndOkCallback;