diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index c22684be7..3e9f30c5c 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -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 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 (rnti,tbInfo )); - } - else - { - NS_FATAL_ERROR ("Expectd two TBs from the same UE"); - } -} - bool LteSpectrumPhy::StartTx (Ptr pb) @@ -412,6 +394,26 @@ LteSpectrumPhy::StartRx (Ptr spectrumRxParams) } } + +void +LteSpectrumPhy::AddExpectedTb (uint16_t rnti, uint16_t size, uint8_t mcs, std::vector 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 (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 diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index a76e3cd7a..cb14066a9 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -435,6 +435,7 @@ LteUePhy::ReceiveIdealControlMessage (Ptr 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);