From 3ea8979c012786c46d5c52b9077a6a1abc41a75d Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Wed, 1 Apr 2015 15:47:34 +0200
Subject: [PATCH] removed LteSpectrumPhy's LtePhyRxDataEndErrorCallback

---
 CHANGES.html                      |  2 ++
 src/lte/model/lte-spectrum-phy.cc | 26 --------------------------
 src/lte/model/lte-spectrum-phy.h  |  1 -
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index 7da00da55..fb8bffb7a 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -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>
diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc
index 7776f6066..60e58242e 100644
--- a/src/lte/model/lte-spectrum-phy.cc
+++ b/src/lte/model/lte-spectrum-phy.cc
@@ -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);
 }
 
diff --git a/src/lte/model/lte-spectrum-phy.h b/src/lte/model/lte-spectrum-phy.h
index bdf0c70e3..3193144ba 100644
--- a/src/lte/model/lte-spectrum-phy.h
+++ b/src/lte/model/lte-spectrum-phy.h
@@ -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;