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

commit debug stuff for merge with ns-3-lena-dev

Browse Source
This commit is contained in:
Marco Miozzo
2011-11-24 12:30:32 +01:00
parent 998533b112
commit 228fe599eb
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,24 +224,6 @@ LteSpectrumPhy::ChangeState (State newState)
m_state = newState;
}
void
LteSpectrumPhy::AddExpectedTb (uint16_t rnti, uint16_t size, uint8_t mcs, std::vector<int> map)
{
NS_LOG_LOGIC (this << " rnti: " << rnti << " size " << size << " mcs " << mcs);
expectedTbs_t::iterator it;
it = m_expectedTbs.find (rnti);
if (it == m_expectedTbs.end ())
{
// insert new entry
tbInfo_t tbInfo = {size, mcs, map, false};
m_expectedTbs.insert (std::pair<uint16_t, tbInfo_t> (rnti,tbInfo ));
}
else
{
NS_FATAL_ERROR ("Expectd two TBs from the same UE");
}
}
bool
LteSpectrumPhy::StartTx (Ptr<PacketBurst> pb)
@@ -412,6 +394,26 @@ LteSpectrumPhy::StartRx (Ptr<SpectrumSignalParameters> spectrumRxParams)
}
}
void
LteSpectrumPhy::AddExpectedTb (uint16_t rnti, uint16_t size, uint8_t mcs, std::vector<int> map)
{
NS_LOG_LOGIC (this << " rnti: " << rnti << " size " << size << " mcs " << mcs);
expectedTbs_t::iterator it;
it = m_expectedTbs.find (rnti);
if (it == m_expectedTbs.end ())
{
// insert new entry
tbInfo_t tbInfo = {size, mcs, map, false};
m_expectedTbs.insert (std::pair<uint16_t, tbInfo_t> (rnti,tbInfo ));
}
else
{
NS_FATAL_ERROR ("Expectd two TBs from the same UE");
}
}
void
LteSpectrumPhy::EndRx ()
{
@@ -428,7 +430,7 @@ LteSpectrumPhy::EndRx ()
expectedTbs_t::iterator itTb = m_expectedTbs.begin ();
while (itTb!=m_expectedTbs.end ())
{
NS_LOG_DEBUG (this << "RNTI " << (*itTb).first << " size " << (*itTb).second.size << " mcs " << (*itTb).second.mcs);
NS_LOG_DEBUG (this << "RNTI " << (*itTb).first << " size " << (*itTb).second.size << " mcs " << (uint32_t)(*itTb).second.mcs);
itTb++;
}
m_expectedTbs.clear (); // DEBUG

1
src/lte/model/lte-ue-phy.cc
View File

@@ -435,6 +435,7 @@ LteUePhy::ReceiveIdealControlMessage (Ptr<IdealControlMessage> msg)
}
// send TB info to LteSpectrumPhy
NS_LOG_DEBUG (this << " UE " << m_rnti << " DCI " << dci.m_rnti << " bimap " << dci.m_rbBitmap);
m_downlinkSpectrumPhy->AddExpectedTb (dci.m_rnti, dci.m_tbsSize.at (0), dci.m_mcs.at (0), dlRb); // SISO mode
SetSubChannelsForReception (dlRb);