diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc index 20be1f1e5..02067c397 100644 --- a/src/lte/helper/lena-helper.cc +++ b/src/lte/helper/lena-helper.cc @@ -156,7 +156,6 @@ LenaHelper::InstallSingleEnbDevice (Ptr n) m_uplinkChannel->AddRx (ulPhy); Ptr mac = CreateObject (); - //Ptr sched = m_scheduler.Create (); Ptr sched = Create (); Ptr rrc = Create (); Ptr dev = CreateObject (n, phy, mac, sched, rrc); @@ -165,7 +164,6 @@ LenaHelper::InstallSingleEnbDevice (Ptr n) ulPhy->SetDevice (dev); n->AddDevice (dev); - //Ptr mac = dev->GetMac (); ulPhy->SetPhyMacRxEndOkCallback (MakeCallback (&LteEnbPhy::PhyPduReceived, phy)); dev->Start (); @@ -207,7 +205,6 @@ LenaHelper::InstallSingleUeDevice (Ptr n) ulPhy->SetDevice (dev); n->AddDevice (dev); - //Ptr mac = dev->GetMac (); dlPhy->SetPhyMacRxEndOkCallback (MakeCallback (&LteUePhy::PhyPduReceived, phy)); dev->Start (); diff --git a/src/lte/model/lte-enb-net-device.cc b/src/lte/model/lte-enb-net-device.cc index cef75fe48..3437eab3a 100644 --- a/src/lte/model/lte-enb-net-device.cc +++ b/src/lte/model/lte-enb-net-device.cc @@ -112,8 +112,6 @@ LteEnbNetDevice::InitLteEnbNetDevice (void) { NS_LOG_FUNCTION (this); - //m_mac = CreateObject (); - // m_mac->SetDevice (this->GetObject ()); SetNode (0); if (GetPhy () == 0) { @@ -123,13 +121,11 @@ LteEnbNetDevice::InitLteEnbNetDevice (void) { NS_LOG_DEBUG (this << "PHY ! NULL"); } - //m_rrc = Create (); + m_rrc->SetLteEnbCmacSapProvider (m_mac->GetLteEnbCmacSapProvider ()); m_mac->SetLteEnbCmacSapUser (m_rrc->GetLteEnbCmacSapUser ()); m_rrc->SetLteMacSapProvider (m_mac->GetLteMacSapProvider ()); - //m_scheduler = Create (); - //m_scheduler = Create (); m_mac->SetFfMacSchedSapProvider (m_scheduler->GetFfMacSchedSapProvider ()); m_mac->SetFfMacCschedSapProvider (m_scheduler->GetFfMacCschedSapProvider ()); diff --git a/src/lte/model/lte-ue-net-device.cc b/src/lte/model/lte-ue-net-device.cc index c87b94af9..aed4424c9 100644 --- a/src/lte/model/lte-ue-net-device.cc +++ b/src/lte/model/lte-ue-net-device.cc @@ -106,8 +106,6 @@ LteUeNetDevice::InitLteUeNetDevice (void) NS_LOG_FUNCTION (this); m_targetEnb = 0; SetNode (0); - //m_mac = CreateObject (); - //m_rrc = Create (); m_rrc->SetLteUeCmacSapProvider (m_mac->GetLteUeCmacSapProvider ()); m_mac->SetLteUeCmacSapUser (m_rrc->GetLteUeCmacSapUser ()); m_rrc->SetLteMacSapProvider (m_mac->GetLteMacSapProvider ());