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

polishment of comments

Browse Source
This commit is contained in:
Marco Miozzo
2011-03-24 10:24:08 +01:00
parent b372eab5e7
commit affdaeb261
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lte/helper/lena-helper.cc
View File

@@ -156,7 +156,6 @@ LenaHelper::InstallSingleEnbDevice (Ptr<Node> n)
m_uplinkChannel->AddRx (ulPhy);
Ptr<LteEnbMac> mac = CreateObject<LteEnbMac> ();
//Ptr<FfMacScheduler> sched = m_scheduler.Create<FfMacScheduler> ();
Ptr<FfMacScheduler> sched = Create<PfFfMacScheduler> ();
Ptr<LteEnbRrc> rrc = Create<LteEnbRrc> ();
Ptr<LteEnbNetDevice> dev = CreateObject<LteEnbNetDevice> (n, phy, mac, sched, rrc);
@@ -165,7 +164,6 @@ LenaHelper::InstallSingleEnbDevice (Ptr<Node> n)
ulPhy->SetDevice (dev);
n->AddDevice (dev);
//Ptr<LteEnbMac> mac = dev->GetMac ();
ulPhy->SetPhyMacRxEndOkCallback (MakeCallback (&LteEnbPhy::PhyPduReceived, phy));
dev->Start ();
@@ -207,7 +205,6 @@ LenaHelper::InstallSingleUeDevice (Ptr<Node> n)
ulPhy->SetDevice (dev);
n->AddDevice (dev);
//Ptr<LteUeMac> mac = dev->GetMac ();
dlPhy->SetPhyMacRxEndOkCallback (MakeCallback (&LteUePhy::PhyPduReceived, phy));
dev->Start ();

6
src/lte/model/lte-enb-net-device.cc
View File

@@ -112,8 +112,6 @@ LteEnbNetDevice::InitLteEnbNetDevice (void)
{
NS_LOG_FUNCTION (this);
//m_mac = CreateObject<LteEnbMac> ();
// m_mac->SetDevice (this->GetObject<LteNetDevice> ());
SetNode (0);
if (GetPhy () == 0)
{
@@ -123,13 +121,11 @@ LteEnbNetDevice::InitLteEnbNetDevice (void)
{
NS_LOG_DEBUG (this << "PHY ! NULL");
}
//m_rrc = Create<LteEnbRrc> ();
m_rrc->SetLteEnbCmacSapProvider (m_mac->GetLteEnbCmacSapProvider ());
m_mac->SetLteEnbCmacSapUser (m_rrc->GetLteEnbCmacSapUser ());
m_rrc->SetLteMacSapProvider (m_mac->GetLteMacSapProvider ());
//m_scheduler = Create<RrFfMacScheduler> ();
//m_scheduler = Create<PfFfMacScheduler> ();
m_mac->SetFfMacSchedSapProvider (m_scheduler->GetFfMacSchedSapProvider ());
m_mac->SetFfMacCschedSapProvider (m_scheduler->GetFfMacCschedSapProvider ());

2
src/lte/model/lte-ue-net-device.cc
View File

@@ -106,8 +106,6 @@ LteUeNetDevice::InitLteUeNetDevice (void)
NS_LOG_FUNCTION (this);
m_targetEnb = 0;
SetNode (0);
//m_mac = CreateObject<LteUeMac> ();
//m_rrc = Create<LteUeRrc> ();
m_rrc->SetLteUeCmacSapProvider (m_mac->GetLteUeCmacSapProvider ());
m_mac->SetLteUeCmacSapUser (m_rrc->GetLteUeCmacSapUser ());
m_rrc->SetLteMacSapProvider (m_mac->GetLteMacSapProvider ());