F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed useless LteSpectrumPhy::AbortRx

Browse Source
This commit is contained in:
Nicola Baldo
2011-03-30 18:19:21 +02:00
parent c90d5ae62b
commit c7fcba381e
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lte/model/lte-spectrum-phy.cc
View File

@@ -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 ()
{

2
src/lte/model/lte-spectrum-phy.h
View File

@@ -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;