removed LteSpectrumPhy's LtePhyRxDataEndErrorCallback
authorNicola Baldo <nbaldo@cttc.es>
Wed, 01 Apr 2015 15:47:34 +0200
changeset 11270 de1a251c80a4
parent 11269 db337450b114
child 11271 f273412862a0
removed LteSpectrumPhy's LtePhyRxDataEndErrorCallback
CHANGES.html
src/lte/model/lte-spectrum-phy.cc
src/lte/model/lte-spectrum-phy.h
--- a/CHANGES.html	Wed Apr 01 15:38:12 2015 +0200
+++ b/CHANGES.html	Wed Apr 01 15:47:34 2015 +0200
@@ -57,6 +57,8 @@
 </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>
--- a/src/lte/model/lte-spectrum-phy.cc	Wed Apr 01 15:38:12 2015 +0200
+++ b/src/lte/model/lte-spectrum-phy.cc	Wed Apr 01 15:47:34 2015 +0200
@@ -148,7 +148,6 @@
   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 @@
 }
 
 
-
-void
-LteSpectrumPhy::SetLtePhyTxEndCallback (LtePhyTxEndCallback c)
-{
-  NS_LOG_FUNCTION (this);
-  m_ltePhyTxEndCallback = c;
-}
-
-
 void
 LteSpectrumPhy::SetLtePhyRxDataEndErrorCallback (LtePhyRxDataEndErrorCallback c)
 {
@@ -599,21 +589,7 @@
   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 @@
 
   NS_ASSERT (m_state == TX);
   NS_ASSERT (m_txPacketBurst == 0);
-  NS_ASSERT (m_ltePhyTxEndCallback.IsNull () == true);
   ChangeState (IDLE);
 }
 
@@ -638,7 +613,6 @@
 
   NS_ASSERT (m_state == TX);
   NS_ASSERT (m_txPacketBurst == 0);
-  NS_ASSERT (m_ltePhyTxEndCallback.IsNull () == true);
   ChangeState (IDLE);
 }
 
--- a/src/lte/model/lte-spectrum-phy.h	Wed Apr 01 15:38:12 2015 +0200
+++ b/src/lte/model/lte-spectrum-phy.h	Wed Apr 01 15:47:34 2015 +0200
@@ -455,7 +455,6 @@
   TracedCallback<Ptr<const Packet> > m_phyRxEndOkTrace;
   TracedCallback<Ptr<const Packet> > m_phyRxEndErrorTrace;
 
-  LtePhyTxEndCallback        m_ltePhyTxEndCallback;
   LtePhyRxDataEndErrorCallback   m_ltePhyRxDataEndErrorCallback;
   LtePhyRxDataEndOkCallback      m_ltePhyRxDataEndOkCallback;