From c7fcba381e76e48efcbada9c5030fdc4905f1afc Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Wed, 30 Mar 2011 18:19:21 +0200
Subject: [PATCH] removed useless LteSpectrumPhy::AbortRx

---
 src/lte/model/lte-spectrum-phy.cc | 24 ------------------------
 src/lte/model/lte-spectrum-phy.h  |  2 --
 2 files changed, 26 deletions(-)

diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc
index 1db2f1344..45e6864ee 100644
--- a/src/lte/model/lte-spectrum-phy.cc
+++ b/src/lte/model/lte-spectrum-phy.cc
@@ -98,9 +98,6 @@ LteSpectrumPhy::GetTypeId (void)
     .AddTraceSource ("RxStart",
                      "Trace fired when the start of a signal is detected",
                      MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxStartTrace))
-    .AddTraceSource ("RxAbort",
-                     "Trace fired when a previously started RX is aborted before time",
-                     MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxAbortTrace))
     .AddTraceSource ("RxEndOk",
                      "Trace fired when a previosuly started RX terminates successfully",
                      MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxEndOkTrace))
@@ -390,27 +387,6 @@ LteSpectrumPhy::StartRx (Ptr<PacketBurst> pb, Ptr <const SpectrumValue> rxPsd, S
     }
 }
 
-void
-LteSpectrumPhy::AbortRx ()
-{
-  NS_LOG_FUNCTION (this);
-  NS_LOG_LOGIC (this << " state: " << m_state);
-
-  NS_ASSERT (m_state == RX);
-
-  for (std::list<Ptr<Packet> >::const_iterator iter = m_rxPacketBurst->Begin (); iter
-       != m_rxPacketBurst->End (); ++iter)
-    {
-      Ptr<Packet> packet = (*iter)->Copy ();
-      m_phyRxAbortTrace (packet);
-    }
-
-  m_endRxEventId.Cancel ();
-  m_rxPacketBurst = 0;
-  ChangeState (IDLE);
-}
-
-
 void
 LteSpectrumPhy::EndRx ()
 {
diff --git a/src/lte/model/lte-spectrum-phy.h b/src/lte/model/lte-spectrum-phy.h
index 9e23607ba..132a8a082 100644
--- a/src/lte/model/lte-spectrum-phy.h
+++ b/src/lte/model/lte-spectrum-phy.h
@@ -155,7 +155,6 @@ public:
 private:
   void ChangeState (State newState);
   void EndTx ();
-  void AbortRx ();
   void EndRx ();
 
   EventId m_endRxEventId;
@@ -176,7 +175,6 @@ private:
   TracedCallback<Ptr<const Packet> > m_phyTxStartTrace;
   TracedCallback<Ptr<const Packet> > m_phyTxEndTrace;
   TracedCallback<Ptr<const Packet> > m_phyRxStartTrace;
-  TracedCallback<Ptr<const Packet> > m_phyRxAbortTrace;
   TracedCallback<Ptr<const Packet> > m_phyRxEndOkTrace;
   TracedCallback<Ptr<const Packet> > m_phyRxEndErrorTrace;