From 365394dff1e0318244c8bc0ed1c07a90f29995d5 Mon Sep 17 00:00:00 2001 From: CTTC Date: Thu, 10 Mar 2011 18:57:41 +0100 Subject: [PATCH] renamed several LTE files and classes --- src/lte/helper/lena-helper.cc | 44 +++++----- src/lte/helper/lena-helper.h | 4 +- src/lte/model/enb-lte-spectrum-phy.cc | 2 +- src/lte/model/enb-lte-spectrum-phy.h | 2 +- src/lte/model/ideal-control-messages.cc | 2 +- src/lte/model/{amc-module.cc => lte-amc.cc} | 16 ++-- src/lte/model/{amc-module.h => lte-amc.h} | 4 +- src/lte/model/lte-enb-mac.cc | 24 ++--- src/lte/model/lte-enb-mac.h | 4 +- ...nb-net-device.cc => lte-enb-net-device.cc} | 58 ++++++------ ...{enb-net-device.h => lte-enb-net-device.h} | 22 ++--- src/lte/model/{enb-phy.cc => lte-enb-phy.cc} | 80 ++++++++--------- src/lte/model/{enb-phy.h => lte-enb-phy.h} | 18 ++-- src/lte/model/lte-net-device.cc | 2 +- src/lte/model/lte-ue-mac.cc | 16 ++-- src/lte/model/lte-ue-mac.h | 2 +- ...{ue-net-device.cc => lte-ue-net-device.cc} | 48 +++++----- .../{ue-net-device.h => lte-ue-net-device.h} | 32 +++---- src/lte/model/{ue-phy.cc => lte-ue-phy.cc} | 88 +++++++++---------- src/lte/model/{ue-phy.h => lte-ue-phy.h} | 22 ++--- src/lte/model/rr-ff-mac-scheduler.cc | 8 +- src/lte/wscript | 20 ++--- 22 files changed, 259 insertions(+), 259 deletions(-) rename src/lte/model/{amc-module.cc => lte-amc.cc} (98%) rename src/lte/model/{amc-module.h => lte-amc.h} (96%) rename src/lte/model/{enb-net-device.cc => lte-enb-net-device.cc} (76%) rename src/lte/model/{enb-net-device.h => lte-enb-net-device.h} (86%) rename src/lte/model/{enb-phy.cc => lte-enb-phy.cc} (79%) rename src/lte/model/{enb-phy.h => lte-enb-phy.h} (90%) rename src/lte/model/{ue-net-device.cc => lte-ue-net-device.cc} (78%) rename src/lte/model/{ue-net-device.h => lte-ue-net-device.h} (77%) rename src/lte/model/{ue-phy.cc => lte-ue-phy.cc} (76%) rename src/lte/model/{ue-phy.h => lte-ue-phy.h} (92%) diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc index 1177d2145..2bf2435bd 100644 --- a/src/lte/helper/lena-helper.cc +++ b/src/lte/helper/lena-helper.cc @@ -27,15 +27,15 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include @@ -102,7 +102,7 @@ LenaHelper::SetUeDeviceAttribute (std::string name, const AttributeValue &value) Ptr LenaHelper::InstallSingleEnbDevice (Ptr n) { - Ptr phy = CreateObject (); + Ptr phy = CreateObject (); Ptr dlPhy = CreateObject (); Ptr ulPhy = CreateObject (); @@ -123,14 +123,14 @@ LenaHelper::InstallSingleEnbDevice (Ptr n) m_uplinkChannel->AddRx (ulPhy); - Ptr dev = CreateObject (n, phy); + Ptr dev = CreateObject (n, phy); phy->SetDevice (dev); dlPhy->SetDevice (dev); ulPhy->SetDevice (dev); n->AddDevice (dev); Ptr mac = dev->GetMac (); - ulPhy->SetPhyMacRxEndOkCallback (MakeCallback (&EnbLtePhy::PhyPduReceived, phy)); + ulPhy->SetPhyMacRxEndOkCallback (MakeCallback (&LteEnbPhy::PhyPduReceived, phy)); dev->Start (); return dev; @@ -139,7 +139,7 @@ LenaHelper::InstallSingleEnbDevice (Ptr n) Ptr LenaHelper::InstallSingleUeDevice (Ptr n) { - Ptr phy = CreateObject (); + Ptr phy = CreateObject (); Ptr dlPhy = CreateObject (); Ptr ulPhy = CreateObject (); @@ -163,14 +163,14 @@ LenaHelper::InstallSingleUeDevice (Ptr n) m_downlinkChannel->AddRx (dlPhy); - Ptr dev = CreateObject (n, phy); + Ptr dev = CreateObject (n, phy); phy->SetDevice (dev); dlPhy->SetDevice (dev); ulPhy->SetDevice (dev); n->AddDevice (dev); Ptr mac = dev->GetMac (); - dlPhy->SetPhyMacRxEndOkCallback (MakeCallback (&UeLtePhy::PhyPduReceived, phy)); + dlPhy->SetPhyMacRxEndOkCallback (MakeCallback (&LteUePhy::PhyPduReceived, phy)); dev->Start (); return dev; @@ -190,19 +190,19 @@ void LenaHelper::Attach (Ptr ueDevice, Ptr enbDevice) { // setup RRC connection - Ptr enbRrc = enbDevice->GetObject ()->GetRrc (); + Ptr enbRrc = enbDevice->GetObject ()->GetRrc (); uint16_t rnti = enbRrc->AddUe (); - Ptr ueRrc = ueDevice->GetObject ()->GetRrc (); + Ptr ueRrc = ueDevice->GetObject ()->GetRrc (); ueRrc->ConfigureUe (rnti); // attach UE PHY to eNB - ueDevice->GetObject ()->SetTargetEnb (enbDevice->GetObject ()); + ueDevice->GetObject ()->SetTargetEnb (enbDevice->GetObject ()); // WILD HACK - should be done through PHY SAP, probably passing by RRC - Ptr uePhy = ueDevice->GetObject ()->GetPhy (); + Ptr uePhy = ueDevice->GetObject ()->GetPhy (); uePhy->SetRnti (rnti); - Ptr enbPhy = enbDevice->GetObject ()->GetPhy (); + Ptr enbPhy = enbDevice->GetObject ()->GetPhy (); enbPhy->AddUePhy (rnti, uePhy); } @@ -220,9 +220,9 @@ LenaHelper::ActivateEpsBearer (NetDeviceContainer ueDevices, EpsBearer bearer) void LenaHelper::ActivateEpsBearer (Ptr ueDevice, EpsBearer bearer) { - Ptr enbDevice = ueDevice->GetObject ()->GetTargetEnb (); - Ptr enbRrc = enbDevice->GetObject ()->GetRrc (); - Ptr ueRrc = ueDevice->GetObject ()->GetRrc (); + Ptr enbDevice = ueDevice->GetObject ()->GetTargetEnb (); + Ptr enbRrc = enbDevice->GetObject ()->GetRrc (); + Ptr ueRrc = ueDevice->GetObject ()->GetRrc (); uint16_t rnti = ueRrc->GetRnti (); uint8_t lcid = enbRrc->SetupRadioBearer (rnti, bearer); ueRrc->SetupRadioBearer (rnti, bearer, lcid); @@ -240,8 +240,8 @@ LenaHelper::EnableLogComponents (void) LogComponentEnable ("RrPacketScheduler", LOG_LEVEL_ALL); LogComponentEnable ("LtePhy", LOG_LEVEL_ALL); - LogComponentEnable ("EnbLtePhy", LOG_LEVEL_ALL); - LogComponentEnable ("UeLtePhy", LOG_LEVEL_ALL); + LogComponentEnable ("LteEnbPhy", LOG_LEVEL_ALL); + LogComponentEnable ("LteUePhy", LOG_LEVEL_ALL); LogComponentEnable ("LteSpectrumPhy", LOG_LEVEL_ALL); LogComponentEnable ("LteInterference", LOG_LEVEL_ALL); @@ -255,8 +255,8 @@ LenaHelper::EnableLogComponents (void) LogComponentEnable ("PathLossModel", LOG_LEVEL_ALL); LogComponentEnable ("LteNetDevice", LOG_LEVEL_ALL); - LogComponentEnable ("UeNetDevice", LOG_LEVEL_ALL); - LogComponentEnable ("EnbNetDevice", LOG_LEVEL_ALL); + LogComponentEnable ("LteUeNetDevice", LOG_LEVEL_ALL); + LogComponentEnable ("LteEnbNetDevice", LOG_LEVEL_ALL); } diff --git a/src/lte/helper/lena-helper.h b/src/lte/helper/lena-helper.h index cf6204f98..57c434d52 100644 --- a/src/lte/helper/lena-helper.h +++ b/src/lte/helper/lena-helper.h @@ -34,8 +34,8 @@ namespace ns3 { -class UeLtePhy; -class EnbLtePhy; +class LteUePhy; +class LteEnbPhy; class SpectrumChannel; diff --git a/src/lte/model/enb-lte-spectrum-phy.cc b/src/lte/model/enb-lte-spectrum-phy.cc index 98d7b6f2b..f93eaff33 100644 --- a/src/lte/model/enb-lte-spectrum-phy.cc +++ b/src/lte/model/enb-lte-spectrum-phy.cc @@ -80,7 +80,7 @@ EnbLteSpectrumPhy::CalcSinrValues (Ptr rxPsd,Ptr #include #include #include -NS_LOG_COMPONENT_DEFINE ("AmcModule"); +NS_LOG_COMPONENT_DEFINE ("LteAmc"); namespace ns3 { @@ -226,7 +226,7 @@ int TransportBlockSizeTable [110][27] = { int -AmcModule::GetCqiFromSpectralEfficiency (double s) +LteAmc::GetCqiFromSpectralEfficiency (double s) { NS_LOG_FUNCTION (s); int cqi = 1; // == CqiIndex[0] @@ -240,7 +240,7 @@ AmcModule::GetCqiFromSpectralEfficiency (double s) int -AmcModule::GetMcsFromCqi (int cqi) +LteAmc::GetMcsFromCqi (int cqi) { NS_LOG_FUNCTION (cqi); double spectralEfficiency = SpectralEfficiencyForCqiIndex[cqi - 1]; @@ -255,7 +255,7 @@ AmcModule::GetMcsFromCqi (int cqi) int -AmcModule::GetTbSizeFromMcs (int mcs) +LteAmc::GetTbSizeFromMcs (int mcs) { NS_LOG_FUNCTION (mcs); NS_LOG_FUNCTION (mcs << TransportBlockSize[mcs]); @@ -263,7 +263,7 @@ AmcModule::GetTbSizeFromMcs (int mcs) } int -AmcModule::GetTbSizeFromMcs (int mcs, int nprb) +LteAmc::GetTbSizeFromMcs (int mcs, int nprb) { NS_LOG_FUNCTION (mcs); NS_LOG_FUNCTION (mcs << TransportBlockSize[mcs]); @@ -277,7 +277,7 @@ AmcModule::GetTbSizeFromMcs (int mcs, int nprb) double -AmcModule::GetSpectralEfficiencyFromCqi (int cqi) +LteAmc::GetSpectralEfficiencyFromCqi (int cqi) { NS_LOG_FUNCTION (cqi); NS_LOG_FUNCTION (cqi << SpectralEfficiencyForCqiIndex[cqi - 1]); @@ -286,7 +286,7 @@ AmcModule::GetSpectralEfficiencyFromCqi (int cqi) std::vector -AmcModule::CreateCqiFeedbacks (const SpectrumValue& sinr) +LteAmc::CreateCqiFeedbacks (const SpectrumValue& sinr) { NS_LOG_FUNCTION_NOARGS (); diff --git a/src/lte/model/amc-module.h b/src/lte/model/lte-amc.h similarity index 96% rename from src/lte/model/amc-module.h rename to src/lte/model/lte-amc.h index 5bb156b4f..01a4453c9 100644 --- a/src/lte/model/amc-module.h +++ b/src/lte/model/lte-amc.h @@ -30,14 +30,14 @@ namespace ns3 { class SpectrumValue; /** - * \brief The AmcModule class implements the Adaptive Modulation And Coding Scheme + * \brief The LteAmc class implements the Adaptive Modulation And Coding Scheme * as proposed in 3GPP TSG-RAN WG1 - R1-081483 * http://www.3gpp.org/ftp/tsg_ran/WG1_RL1/TSGR1_52b/Docs/R1-081483.zip * * \note All the methods of this class are static, so you'll never * need to create and manage instances of this class. */ -class AmcModule +class LteAmc { public: diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index d044f3e5e..729ed795d 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -24,14 +24,14 @@ #include #include -#include "amc-module.h" +#include "lte-amc.h" #include "ideal-control-messages.h" -#include "enb-net-device.h" -#include "ue-net-device.h" +#include "lte-enb-net-device.h" +#include "lte-ue-net-device.h" #include #include -#include +#include NS_LOG_COMPONENT_DEFINE ("LteEnbMac"); @@ -255,12 +255,12 @@ EnbMemberFfMacCschedSapUser::CschedCellConfigUpdateInd (const struct CschedCellC // ---------- PHY-SAP -class EnbMemberEnbLtePhySapUser : public LteEnbPhySapUser +class EnbMemberLteEnbPhySapUser : public LteEnbPhySapUser { public: - EnbMemberEnbLtePhySapUser (LteEnbMac* mac); + EnbMemberLteEnbPhySapUser (LteEnbMac* mac); - // inherited from EnbLtePhySapUser + // inherited from LteEnbPhySapUser virtual void ReceivePhyPdu (Ptr p); virtual void SubframeIndication (uint32_t frameNo, uint32_t subframeNo); virtual void ReceiveIdealControlMessage (Ptr msg); @@ -269,25 +269,25 @@ private: LteEnbMac* m_mac; }; -EnbMemberEnbLtePhySapUser::EnbMemberEnbLtePhySapUser (LteEnbMac* mac) : m_mac (mac) +EnbMemberLteEnbPhySapUser::EnbMemberLteEnbPhySapUser (LteEnbMac* mac) : m_mac (mac) { } void -EnbMemberEnbLtePhySapUser::ReceivePhyPdu (Ptr p) +EnbMemberLteEnbPhySapUser::ReceivePhyPdu (Ptr p) { m_mac->DoReceivePhyPdu (p); } void -EnbMemberEnbLtePhySapUser::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) +EnbMemberLteEnbPhySapUser::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) { m_mac->DoSubframeIndication (frameNo, subframeNo); } void -EnbMemberEnbLtePhySapUser::ReceiveIdealControlMessage (Ptr msg) +EnbMemberLteEnbPhySapUser::ReceiveIdealControlMessage (Ptr msg) { m_mac->DoReceiveIdealControlMessage (msg); } @@ -316,7 +316,7 @@ LteEnbMac::LteEnbMac () m_schedSapUser = new EnbMemberFfMacSchedSapUser (this); m_cschedSapUser = new EnbMemberFfMacCschedSapUser (this); - m_enbPhySapUser = new EnbMemberEnbLtePhySapUser (this); + m_enbPhySapUser = new EnbMemberLteEnbPhySapUser (this); } diff --git a/src/lte/model/lte-enb-mac.h b/src/lte/model/lte-enb-mac.h index db2f07a16..0db91d409 100644 --- a/src/lte/model/lte-enb-mac.h +++ b/src/lte/model/lte-enb-mac.h @@ -55,7 +55,7 @@ class LteEnbMac : public Object friend class EnbMemberLteMacSapProvider; friend class EnbMemberFfMacSchedSapUser; friend class EnbMemberFfMacCschedSapUser; - friend class EnbMemberEnbLtePhySapUser; + friend class EnbMemberLteEnbPhySapUser; public: static TypeId GetTypeId (void); @@ -165,7 +165,7 @@ private: void DoSchedUlConfigInd (FfMacSchedSapUser::SchedUlConfigIndParameters params); /** - * \brief Forwarded from EnbLtePhySapUser: trigger the start from a new frame + * \brief Forwarded from LteEnbPhySapUser: trigger the start from a new frame * * \param frameNo frame number * \param subframeNo subframe number diff --git a/src/lte/model/enb-net-device.cc b/src/lte/model/lte-enb-net-device.cc similarity index 76% rename from src/lte/model/enb-net-device.cc rename to src/lte/model/lte-enb-net-device.cc index 02acba233..21cbe0446 100644 --- a/src/lte/model/enb-net-device.cc +++ b/src/lte/model/lte-enb-net-device.cc @@ -31,53 +31,53 @@ #include "ns3/trace-source-accessor.h" #include "ns3/pointer.h" #include "ns3/enum.h" -#include "amc-module.h" +#include "lte-amc.h" #include "lte-enb-mac.h" -#include "enb-net-device.h" +#include "lte-enb-net-device.h" #include "lte-enb-rrc.h" -#include "ue-net-device.h" -#include "enb-phy.h" +#include "lte-ue-net-device.h" +#include "lte-enb-phy.h" #include "rr-ff-mac-scheduler.h" -NS_LOG_COMPONENT_DEFINE ("EnbNetDevice"); +NS_LOG_COMPONENT_DEFINE ("LteEnbNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( EnbNetDevice); +NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice); -uint16_t EnbNetDevice::m_cellIdCounter = 0; +uint16_t LteEnbNetDevice::m_cellIdCounter = 0; -TypeId EnbNetDevice::GetTypeId (void) +TypeId LteEnbNetDevice::GetTypeId (void) { static TypeId tid = - TypeId ("ns3::EnbNetDevice") + TypeId ("ns3::LteEnbNetDevice") .SetParent (); return tid; } -EnbNetDevice::EnbNetDevice (void) +LteEnbNetDevice::LteEnbNetDevice (void) { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("This constructor should not be called"); - InitEnbNetDevice (); + InitLteEnbNetDevice (); } -EnbNetDevice::EnbNetDevice (Ptr node, Ptr phy) +LteEnbNetDevice::LteEnbNetDevice (Ptr node, Ptr phy) : m_phy (phy) { NS_LOG_FUNCTION (this); - InitEnbNetDevice (); + InitLteEnbNetDevice (); SetNode (node); } -EnbNetDevice::~EnbNetDevice (void) +LteEnbNetDevice::~LteEnbNetDevice (void) { NS_LOG_FUNCTION (this); } void -EnbNetDevice::DoDispose () +LteEnbNetDevice::DoDispose () { NS_LOG_FUNCTION (this); @@ -95,7 +95,7 @@ EnbNetDevice::DoDispose () void -EnbNetDevice::InitEnbNetDevice (void) +LteEnbNetDevice::InitLteEnbNetDevice (void) { NS_LOG_FUNCTION (this); @@ -122,31 +122,31 @@ EnbNetDevice::InitEnbNetDevice (void) m_scheduler->SetFfMacSchedSapUser (m_mac->GetFfMacSchedSapUser ()); m_scheduler->SetFfMacCschedSapUser (m_mac->GetFfMacCschedSapUser ()); - GetPhy ()->GetObject ()->SetLteEnbPhySapUser (m_mac->GetLteEnbPhySapUser ()); - m_mac->SetLteEnbPhySapProvider (GetPhy ()->GetObject ()->GetLteEnbPhySapProvider ()); + GetPhy ()->GetObject ()->SetLteEnbPhySapUser (m_mac->GetLteEnbPhySapUser ()); + m_mac->SetLteEnbPhySapProvider (GetPhy ()->GetObject ()->GetLteEnbPhySapProvider ()); m_rrc->ConfigureCell (25, 25); NS_ASSERT_MSG (m_cellIdCounter < 65535, "max num eNBs exceeded"); m_cellId = ++m_cellIdCounter; // WILD HACK - should use the PHY SAP instead. Probably should handle this through the RRC - GetPhy ()->GetObject ()->DoSetBandwidth (25,25); - GetPhy ()->GetObject ()->DoSetCellId (m_cellId); + GetPhy ()->GetObject ()->DoSetBandwidth (25,25); + GetPhy ()->GetObject ()->DoSetCellId (m_cellId); - Simulator::ScheduleNow (&EnbLtePhy::StartFrame, GetPhy ()->GetObject ()); + Simulator::ScheduleNow (&LteEnbPhy::StartFrame, GetPhy ()->GetObject ()); } Ptr -EnbNetDevice::GetMac (void) +LteEnbNetDevice::GetMac (void) { NS_LOG_FUNCTION (this); return m_mac; } -Ptr -EnbNetDevice::GetPhy (void) const +Ptr +LteEnbNetDevice::GetPhy (void) const { NS_LOG_FUNCTION (this); return m_phy; @@ -154,7 +154,7 @@ EnbNetDevice::GetPhy (void) const bool -EnbNetDevice::DoSend (Ptr packet, const Mac48Address& source, +LteEnbNetDevice::DoSend (Ptr packet, const Mac48Address& source, const Mac48Address& dest, uint16_t protocolNumber) { NS_LOG_FUNCTION (this << source << dest << protocolNumber); @@ -184,7 +184,7 @@ EnbNetDevice::DoSend (Ptr packet, const Mac48Address& source, void -EnbNetDevice::DoReceive (Ptr p) +LteEnbNetDevice::DoReceive (Ptr p) { NS_LOG_FUNCTION (this << p); ForwardUp (p->Copy ()); @@ -192,7 +192,7 @@ EnbNetDevice::DoReceive (Ptr p) void -EnbNetDevice::SendIdealPdcchMessage (void) +LteEnbNetDevice::SendIdealPdcchMessage (void) { NS_LOG_FUNCTION (this); /* @@ -203,13 +203,13 @@ EnbNetDevice::SendIdealPdcchMessage (void) } Ptr -EnbNetDevice::GetRrc () +LteEnbNetDevice::GetRrc () { return m_rrc; } uint16_t -EnbNetDevice::GetCellId () +LteEnbNetDevice::GetCellId () { return m_cellId; } diff --git a/src/lte/model/enb-net-device.h b/src/lte/model/lte-enb-net-device.h similarity index 86% rename from src/lte/model/enb-net-device.h rename to src/lte/model/lte-enb-net-device.h index 71e04116d..c19abfa3c 100644 --- a/src/lte/model/enb-net-device.h +++ b/src/lte/model/lte-enb-net-device.h @@ -19,8 +19,8 @@ * Author: Marco Miozzo : Update to FF API Architecture */ -#ifndef ENB_NET_DEVICE_H -#define ENB_NET_DEVICE_H +#ifndef LTE_ENB_NET_DEVICE_H +#define LTE_ENB_NET_DEVICE_H #include "lte-net-device.h" #include "ns3/event-id.h" @@ -37,7 +37,7 @@ class Packet; class PacketBurst; class Node; class LtePhy; -class EnbLtePhy; +class LteEnbPhy; class LteEnbMac; class LteEnbRrc; class RrFfMacScheduler; @@ -46,26 +46,26 @@ class RrFfMacScheduler; /** * The eNodeB device implementation */ -class EnbNetDevice : public LteNetDevice +class LteEnbNetDevice : public LteNetDevice { public: static TypeId GetTypeId (void); - EnbNetDevice (void); + LteEnbNetDevice (void); /** * \brief Create eNB net device * \param node the network node * \param phy the physical object attache dto it */ - EnbNetDevice (Ptr node, Ptr phy); + LteEnbNetDevice (Ptr node, Ptr phy); - virtual ~EnbNetDevice (void); + virtual ~LteEnbNetDevice (void); virtual void DoDispose (void); /** * \brief Initialize all parameters of this device */ - void InitEnbNetDevice (void); + void InitLteEnbNetDevice (void); /** * \return a pointer to the MAC @@ -75,7 +75,7 @@ public: /** * \return a pointer to the physical layer. */ - Ptr GetPhy (void) const; + Ptr GetPhy (void) const; @@ -106,7 +106,7 @@ private: Ptr m_mac; - Ptr m_phy; + Ptr m_phy; Ptr m_rrc; @@ -119,4 +119,4 @@ private: } // namespace ns3 -#endif /* ENB_NET_DEVICE_H */ +#endif /* LTE_ENB_NET_DEVICE_H */ diff --git a/src/lte/model/enb-phy.cc b/src/lte/model/lte-enb-phy.cc similarity index 79% rename from src/lte/model/enb-phy.cc rename to src/lte/model/lte-enb-phy.cc index 65ddc3b35..8e472baa1 100644 --- a/src/lte/model/enb-phy.cc +++ b/src/lte/model/lte-enb-phy.cc @@ -24,15 +24,15 @@ #include #include #include "ns3/spectrum-error-model.h" -#include "enb-phy.h" +#include "lte-enb-phy.h" #include "lte-net-device.h" #include "lte-spectrum-value-helper.h" #include "ideal-control-messages.h" -#include "enb-net-device.h" +#include "lte-enb-net-device.h" #include "lte-enb-mac.h" -NS_LOG_COMPONENT_DEFINE ("EnbLtePhy"); +NS_LOG_COMPONENT_DEFINE ("LteEnbPhy"); namespace ns3 { @@ -45,7 +45,7 @@ namespace ns3 { class EnbMemberLteEnbPhySapProvider : public LteEnbPhySapProvider { public: - EnbMemberLteEnbPhySapProvider (EnbLtePhy* phy); + EnbMemberLteEnbPhySapProvider (LteEnbPhy* phy); // inherited from LteEnbPhySapProvider virtual void SendMacPdu (Ptr p); @@ -54,10 +54,10 @@ public: virtual void SendIdealControlMessage (Ptr msg); private: - EnbLtePhy* m_phy; + LteEnbPhy* m_phy; }; -EnbMemberLteEnbPhySapProvider::EnbMemberLteEnbPhySapProvider (EnbLtePhy* phy) : m_phy (phy) +EnbMemberLteEnbPhySapProvider::EnbMemberLteEnbPhySapProvider (LteEnbPhy* phy) : m_phy (phy) { } @@ -89,15 +89,15 @@ EnbMemberLteEnbPhySapProvider::SendIdealControlMessage (Ptr //////////////////////////////////////// -// generic EnbLtePhy methods +// generic LteEnbPhy methods //////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EnbLtePhy); +NS_OBJECT_ENSURE_REGISTERED (LteEnbPhy); -EnbLtePhy::EnbLtePhy () +LteEnbPhy::LteEnbPhy () : m_nrFrames (0), m_nrSubFrames (0) { @@ -106,28 +106,28 @@ EnbLtePhy::EnbLtePhy () TypeId -EnbLtePhy::GetTypeId (void) +LteEnbPhy::GetTypeId (void) { - static TypeId tid = TypeId ("ns3::EnbLtePhy") + static TypeId tid = TypeId ("ns3::LteEnbPhy") .SetParent () - .AddConstructor () + .AddConstructor () ; return tid; } -EnbLtePhy::~EnbLtePhy () +LteEnbPhy::~LteEnbPhy () { } void -EnbLtePhy::SetLteEnbPhySapUser (LteEnbPhySapUser* s) +LteEnbPhy::SetLteEnbPhySapUser (LteEnbPhySapUser* s) { m_enbPhySapUser = s; } LteEnbPhySapProvider* -EnbLtePhy::GetLteEnbPhySapProvider () +LteEnbPhy::GetLteEnbPhySapProvider () { return (m_enbPhySapProvider); } @@ -135,13 +135,13 @@ EnbLtePhy::GetLteEnbPhySapProvider () bool -EnbLtePhy::AddUePhy (uint8_t rnti, Ptr phy) +LteEnbPhy::AddUePhy (uint8_t rnti, Ptr phy) { - std::map >::iterator it; + std::map >::iterator it; it = m_ueAttached.find (rnti); if (it == m_ueAttached.end ()) { - m_ueAttached.insert (std::pair > (rnti, phy)); + m_ueAttached.insert (std::pair > (rnti, phy)); return (true); } else @@ -152,9 +152,9 @@ EnbLtePhy::AddUePhy (uint8_t rnti, Ptr phy) } bool -EnbLtePhy::DeleteUePhy (uint8_t rnti) +LteEnbPhy::DeleteUePhy (uint8_t rnti) { - std::map >::iterator it; + std::map >::iterator it; it = m_ueAttached.find (rnti); if (it == m_ueAttached.end ()) { @@ -171,7 +171,7 @@ EnbLtePhy::DeleteUePhy (uint8_t rnti) void -EnbLtePhy::DoSendMacPdu (Ptr p) +LteEnbPhy::DoSendMacPdu (Ptr p) { // NS_LOG_FUNCTION (this << pb->GetNPackets () << pb->GetSize ()); // return GetDownlinkSpectrumPhy ()->StartTx (pb); @@ -182,14 +182,14 @@ EnbLtePhy::DoSendMacPdu (Ptr p) void -EnbLtePhy::PhyPduReceived (Ptr p) +LteEnbPhy::PhyPduReceived (Ptr p) { NS_LOG_FUNCTION (this); m_enbPhySapUser->ReceivePhyPdu (p); } void -EnbLtePhy::DoSetDownlinkSubChannels () +LteEnbPhy::DoSetDownlinkSubChannels () { NS_LOG_FUNCTION (this); Ptr txPsd = CreateTxPowerSpectralDensity (); @@ -198,7 +198,7 @@ EnbLtePhy::DoSetDownlinkSubChannels () Ptr -EnbLtePhy::CreateTxPowerSpectralDensity () +LteEnbPhy::CreateTxPowerSpectralDensity () { NS_LOG_FUNCTION (this); @@ -210,14 +210,14 @@ EnbLtePhy::CreateTxPowerSpectralDensity () void -EnbLtePhy::CalcChannelQualityForUe (std::vector sinr, Ptr ue) +LteEnbPhy::CalcChannelQualityForUe (std::vector sinr, Ptr ue) { NS_LOG_FUNCTION (this); } void -EnbLtePhy::DoSendIdealControlMessage (Ptr msg) +LteEnbPhy::DoSendIdealControlMessage (Ptr msg) { NS_LOG_FUNCTION (this << msg); // queues the message (wait for MAC-PHY delay) @@ -227,7 +227,7 @@ EnbLtePhy::DoSendIdealControlMessage (Ptr msg) void -EnbLtePhy::ReceiveIdealControlMessage (Ptr msg) +LteEnbPhy::ReceiveIdealControlMessage (Ptr msg) { NS_LOG_FUNCTION (this << msg); m_enbPhySapUser->ReceiveIdealControlMessage (msg); @@ -236,7 +236,7 @@ EnbLtePhy::ReceiveIdealControlMessage (Ptr msg) void -EnbLtePhy::StartFrame (void) +LteEnbPhy::StartFrame (void) { NS_LOG_FUNCTION (this); @@ -248,7 +248,7 @@ EnbLtePhy::StartFrame (void) void -EnbLtePhy::StartSubFrame (void) +LteEnbPhy::StartSubFrame (void) { NS_LOG_FUNCTION (this); @@ -267,7 +267,7 @@ EnbLtePhy::StartSubFrame (void) Ptr msg = (*it); if (msg->GetMessageType () == IdealControlMessage::DL_DCI) { - std::map >::iterator it2; + std::map >::iterator it2; Ptr dci = DynamicCast (msg); it2 = m_ueAttached.find (dci->GetDci ().m_rnti); @@ -297,7 +297,7 @@ EnbLtePhy::StartSubFrame (void) } else if (msg->GetMessageType () == IdealControlMessage::UL_DCI) { - std::map >::iterator it2; + std::map >::iterator it2; Ptr dci = DynamicCast (msg); it2 = m_ueAttached.find (dci->GetDci ().m_rnti); @@ -324,50 +324,50 @@ EnbLtePhy::StartSubFrame (void) } // trigger the MAC - Ptr macEntity = GetDevice ()->GetObject ()->GetMac (); + Ptr macEntity = GetDevice ()->GetObject ()->GetMac (); m_enbPhySapUser->SubframeIndication (m_nrFrames, m_nrSubFrames); // trigger the UE(s) - std::map >::iterator it; + std::map >::iterator it; for (it = m_ueAttached.begin (); it != m_ueAttached.end (); it++) { (*it).second->SubframeIndication (m_nrFrames, m_nrSubFrames); } Simulator::Schedule (Seconds (GetTti ()), - &EnbLtePhy::EndSubFrame, + &LteEnbPhy::EndSubFrame, this); } void -EnbLtePhy::EndSubFrame (void) +LteEnbPhy::EndSubFrame (void) { NS_LOG_FUNCTION (this << Simulator::Now ().GetSeconds ()); if (m_nrSubFrames == 10) { - Simulator::ScheduleNow (&EnbLtePhy::EndFrame, this); + Simulator::ScheduleNow (&LteEnbPhy::EndFrame, this); } else { - Simulator::ScheduleNow (&EnbLtePhy::StartSubFrame, this); + Simulator::ScheduleNow (&LteEnbPhy::StartSubFrame, this); } } void -EnbLtePhy::EndFrame (void) +LteEnbPhy::EndFrame (void) { NS_LOG_FUNCTION (this << Simulator::Now ().GetSeconds ()); - Simulator::ScheduleNow (&EnbLtePhy::StartFrame, this); + Simulator::ScheduleNow (&LteEnbPhy::StartFrame, this); } void -EnbLtePhy::GenerateCqiFeedback (const SpectrumValue& sinr) +LteEnbPhy::GenerateCqiFeedback (const SpectrumValue& sinr) { NS_LOG_FUNCTION (this << sinr); } diff --git a/src/lte/model/enb-phy.h b/src/lte/model/lte-enb-phy.h similarity index 90% rename from src/lte/model/enb-phy.h rename to src/lte/model/lte-enb-phy.h index 813821c96..0f860ede2 100644 --- a/src/lte/model/enb-phy.h +++ b/src/lte/model/lte-enb-phy.h @@ -26,7 +26,7 @@ #include "lte-phy.h" #include #include -#include +#include namespace ns3 { @@ -34,22 +34,22 @@ class PacketBurst; class LteNetDevice; /** - * EnbLtePhy models the physical layer for the eNodeB + * LteEnbPhy models the physical layer for the eNodeB */ -class EnbLtePhy : public LtePhy +class LteEnbPhy : public LtePhy { friend class EnbMemberLteEnbPhySapProvider; public: - EnbLtePhy (); + LteEnbPhy (); /** * \brief Create the eNB phy layer * \param d the device where the phy layer is attached */ - EnbLtePhy (Ptr d); - virtual ~EnbLtePhy (); + LteEnbPhy (Ptr d); + virtual ~LteEnbPhy (); static TypeId GetTypeId (void); @@ -102,7 +102,7 @@ public: void DoSendIdealControlMessage (Ptr msg); - bool AddUePhy (uint8_t rnti, Ptr phy); + bool AddUePhy (uint8_t rnti, Ptr phy); bool DeleteUePhy (uint8_t rnti); @@ -134,7 +134,7 @@ public: private: - std::map > m_ueAttached; + std::map > m_ueAttached; LteEnbPhySapProvider* m_enbPhySapProvider; LteEnbPhySapUser* m_enbPhySapUser; @@ -146,4 +146,4 @@ private: } -#endif /* ENB_PHY_H */ +#endif /* LTE_ENB_PHY_H */ diff --git a/src/lte/model/lte-net-device.cc b/src/lte/model/lte-net-device.cc index 1e8a9d2d2..05741e3a1 100644 --- a/src/lte/model/lte-net-device.cc +++ b/src/lte/model/lte-net-device.cc @@ -30,7 +30,7 @@ #include "ns3/trace-source-accessor.h" #include "ns3/pointer.h" #include "ns3/enum.h" -#include "amc-module.h" +#include "lte-amc.h" #include "ns3/ipv4-header.h" #include diff --git a/src/lte/model/lte-ue-mac.cc b/src/lte/model/lte-ue-mac.cc index a37e23649..c297b17da 100644 --- a/src/lte/model/lte-ue-mac.cc +++ b/src/lte/model/lte-ue-mac.cc @@ -27,7 +27,7 @@ #include #include "lte-ue-mac.h" -#include "ue-net-device.h" +#include "lte-ue-net-device.h" #include "lte-mac-tag.h" #include #include @@ -132,10 +132,10 @@ UeMemberLteMacSapProvider::ReportBufferStatus (ReportBufferStatusParameters para -class UeMemberUeLtePhySapUser : public LteUePhySapUser +class UeMemberLteUePhySapUser : public LteUePhySapUser { public: - UeMemberUeLtePhySapUser (LteUeMac* mac); + UeMemberLteUePhySapUser (LteUeMac* mac); // inherited from LtePhySapUser virtual void ReceivePhyPdu (Ptr p); @@ -146,26 +146,26 @@ private: LteUeMac* m_mac; }; -UeMemberUeLtePhySapUser::UeMemberUeLtePhySapUser (LteUeMac* mac) : m_mac (mac) +UeMemberLteUePhySapUser::UeMemberLteUePhySapUser (LteUeMac* mac) : m_mac (mac) { } void -UeMemberUeLtePhySapUser::ReceivePhyPdu (Ptr p) +UeMemberLteUePhySapUser::ReceivePhyPdu (Ptr p) { m_mac->DoReceivePhyPdu (p); } void -UeMemberUeLtePhySapUser::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) +UeMemberLteUePhySapUser::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) { NS_LOG_LOGIC (this << " UE-MAC does not yet support this primitive"); } void -UeMemberUeLtePhySapUser::ReceiveIdealControlMessage (Ptr msg) +UeMemberLteUePhySapUser::ReceiveIdealControlMessage (Ptr msg) { m_mac->DoReceiveIdealControlMessage (msg); } @@ -192,7 +192,7 @@ LteUeMac::LteUeMac () { m_macSapProvider = new UeMemberLteMacSapProvider (this); m_cmacSapProvider = new UeMemberLteUeCmacSapProvider (this); - m_uePhySapUser = new UeMemberUeLtePhySapUser (this); + m_uePhySapUser = new UeMemberLteUePhySapUser (this); } diff --git a/src/lte/model/lte-ue-mac.h b/src/lte/model/lte-ue-mac.h index 3e3abb2b4..26cba7264 100644 --- a/src/lte/model/lte-ue-mac.h +++ b/src/lte/model/lte-ue-mac.h @@ -38,7 +38,7 @@ class LteUeMac : public Object { friend class UeMemberLteUeCmacSapProvider; friend class UeMemberLteMacSapProvider; - friend class UeMemberUeLtePhySapUser; + friend class UeMemberLteUePhySapUser; public: static TypeId GetTypeId (void); diff --git a/src/lte/model/ue-net-device.cc b/src/lte/model/lte-ue-net-device.cc similarity index 78% rename from src/lte/model/ue-net-device.cc rename to src/lte/model/lte-ue-net-device.cc index f874085e3..5270bc662 100644 --- a/src/lte/model/ue-net-device.cc +++ b/src/lte/model/lte-ue-net-device.cc @@ -31,46 +31,46 @@ #include "ns3/trace-source-accessor.h" #include "ns3/pointer.h" #include "ns3/enum.h" -#include "enb-net-device.h" -#include "ue-net-device.h" +#include "lte-enb-net-device.h" +#include "lte-ue-net-device.h" #include "lte-ue-mac.h" #include "lte-ue-rrc.h" #include "ns3/ipv4-header.h" #include "ns3/ipv4.h" -#include "amc-module.h" +#include "lte-amc.h" // #include "ideal-control-messages.h" -#include +#include -NS_LOG_COMPONENT_DEFINE ("UeNetDevice"); +NS_LOG_COMPONENT_DEFINE ("LteUeNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( UeNetDevice); +NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice); -TypeId UeNetDevice::GetTypeId (void) +TypeId LteUeNetDevice::GetTypeId (void) { static TypeId tid = - TypeId ("ns3::UeNetDevice") + TypeId ("ns3::LteUeNetDevice") .SetParent (); return tid; } -UeNetDevice::UeNetDevice (void) +LteUeNetDevice::LteUeNetDevice (void) { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("This constructor should not be called"); - InitUeNetDevice (); + InitLteUeNetDevice (); } -UeNetDevice::UeNetDevice (Ptr node, Ptr phy) +LteUeNetDevice::LteUeNetDevice (Ptr node, Ptr phy) : m_phy (phy) { NS_LOG_FUNCTION (this); - InitUeNetDevice (); + InitLteUeNetDevice (); SetNode (node); /** @@ -80,13 +80,13 @@ UeNetDevice::UeNetDevice (Ptr node, Ptr phy) phy->DoSetBandwidth (25,25); } -UeNetDevice::~UeNetDevice (void) +LteUeNetDevice::~LteUeNetDevice (void) { NS_LOG_FUNCTION (this); } void -UeNetDevice::DoDispose (void) +LteUeNetDevice::DoDispose (void) { NS_LOG_FUNCTION (this); m_targetEnb = 0; @@ -100,7 +100,7 @@ UeNetDevice::DoDispose (void) } void -UeNetDevice::InitUeNetDevice (void) +LteUeNetDevice::InitLteUeNetDevice (void) { NS_LOG_FUNCTION (this); m_targetEnb = 0; @@ -117,7 +117,7 @@ UeNetDevice::InitUeNetDevice (void) Ptr -UeNetDevice::GetMac (void) +LteUeNetDevice::GetMac (void) { NS_LOG_FUNCTION (this); return m_mac; @@ -125,30 +125,30 @@ UeNetDevice::GetMac (void) Ptr -UeNetDevice::GetRrc (void) +LteUeNetDevice::GetRrc (void) { NS_LOG_FUNCTION (this); return m_rrc; } -Ptr -UeNetDevice::GetPhy (void) const +Ptr +LteUeNetDevice::GetPhy (void) const { NS_LOG_FUNCTION (this); return m_phy; } void -UeNetDevice::SetTargetEnb (Ptr enb) +LteUeNetDevice::SetTargetEnb (Ptr enb) { NS_LOG_FUNCTION (this << enb); m_targetEnb = enb; } -Ptr -UeNetDevice::GetTargetEnb (void) +Ptr +LteUeNetDevice::GetTargetEnb (void) { NS_LOG_FUNCTION (this); return m_targetEnb; @@ -156,7 +156,7 @@ UeNetDevice::GetTargetEnb (void) bool -UeNetDevice::DoSend (Ptr packet, const Mac48Address& source, +LteUeNetDevice::DoSend (Ptr packet, const Mac48Address& source, const Mac48Address& dest, uint16_t protocolNumber) { NS_LOG_FUNCTION (this); @@ -168,7 +168,7 @@ UeNetDevice::DoSend (Ptr packet, const Mac48Address& source, void -UeNetDevice::DoReceive (Ptr p) +LteUeNetDevice::DoReceive (Ptr p) { NS_LOG_FUNCTION (this << p); diff --git a/src/lte/model/ue-net-device.h b/src/lte/model/lte-ue-net-device.h similarity index 77% rename from src/lte/model/ue-net-device.h rename to src/lte/model/lte-ue-net-device.h index cc4b5d37c..5f6f98a16 100644 --- a/src/lte/model/ue-net-device.h +++ b/src/lte/model/lte-ue-net-device.h @@ -19,8 +19,8 @@ * Nicola Baldo */ -#ifndef UE_NET_DEVICE_H -#define UE_NET_DEVICE_H +#ifndef LTE_UE_NET_DEVICE_H +#define LTE_UE_NET_DEVICE_H #include "lte-net-device.h" #include "ns3/event-id.h" @@ -38,28 +38,28 @@ class Packet; class PacketBurst; class Node; class LtePhy; -class UeLtePhy; -class EnbNetDevice; +class LteUePhy; +class LteEnbNetDevice; class LteUeMac; class LteUeRrc; /** - * The UeNetDevice class implements the UE net device + * The LteUeNetDevice class implements the UE net device */ -class UeNetDevice : public LteNetDevice +class LteUeNetDevice : public LteNetDevice { public: static TypeId GetTypeId (void); - UeNetDevice (void); + LteUeNetDevice (void); /** * \brief Create an UE net device * \param node * \param phy */ - UeNetDevice (Ptr node, Ptr phy); + LteUeNetDevice (Ptr node, Ptr phy); - virtual ~UeNetDevice (void); + virtual ~LteUeNetDevice (void); virtual void DoDispose (); @@ -67,24 +67,24 @@ public: Ptr GetRrc (); - Ptr GetPhy (void) const; + Ptr GetPhy (void) const; /** * \brief Initialize the UE */ - void InitUeNetDevice (void); + void InitLteUeNetDevice (void); /** * \brief Set the targer eNB where the UE is registered * \param enb */ - void SetTargetEnb (Ptr enb); + void SetTargetEnb (Ptr enb); /** * \brief Get the targer eNB where the UE is registered * \return the pointer to the enb */ - Ptr GetTargetEnb (void); + Ptr GetTargetEnb (void); private: @@ -95,13 +95,13 @@ private: void DoReceive (Ptr p); - Ptr m_targetEnb; + Ptr m_targetEnb; Ptr m_mac; - Ptr m_phy; + Ptr m_phy; Ptr m_rrc; }; } // namespace ns3 -#endif /* UE_NET_DEVICE_H */ +#endif /* LTE_UE_NET_DEVICE_H */ diff --git a/src/lte/model/ue-phy.cc b/src/lte/model/lte-ue-phy.cc similarity index 76% rename from src/lte/model/ue-phy.cc rename to src/lte/model/lte-ue-phy.cc index 80eaf77c1..2fd40bc70 100644 --- a/src/lte/model/ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -25,19 +25,19 @@ #include #include #include -#include "ue-phy.h" -#include "enb-phy.h" +#include "lte-ue-phy.h" +#include "lte-enb-phy.h" #include "lte-net-device.h" -#include "ue-net-device.h" -#include "enb-net-device.h" +#include "lte-ue-net-device.h" +#include "lte-enb-net-device.h" #include "lte-spectrum-value-helper.h" -#include "amc-module.h" +#include "lte-amc.h" #include "lte-ue-mac.h" #include "ff-mac-common.h" #include "lte-sinr-chunk-processor.h" -NS_LOG_COMPONENT_DEFINE ("UeLtePhy"); +NS_LOG_COMPONENT_DEFINE ("LteUePhy"); namespace ns3 { @@ -46,10 +46,10 @@ namespace ns3 { //////////////////////////////////////// -class UeMemberUeLtePhySapProvider : public LteUePhySapProvider +class UeMemberLteUePhySapProvider : public LteUePhySapProvider { public: - UeMemberUeLtePhySapProvider (UeLtePhy* phy); + UeMemberLteUePhySapProvider (LteUePhy* phy); // inherited from LtePhySapProvider virtual void SendMacPdu (Ptr p); @@ -57,29 +57,29 @@ public: virtual void SendIdealControlMessage (Ptr msg); private: - UeLtePhy* m_phy; + LteUePhy* m_phy; }; -UeMemberUeLtePhySapProvider::UeMemberUeLtePhySapProvider (UeLtePhy* phy) : m_phy (phy) +UeMemberLteUePhySapProvider::UeMemberLteUePhySapProvider (LteUePhy* phy) : m_phy (phy) { } void -UeMemberUeLtePhySapProvider::SendMacPdu (Ptr p) +UeMemberLteUePhySapProvider::SendMacPdu (Ptr p) { m_phy->DoSendMacPdu (p); } void -UeMemberUeLtePhySapProvider::SetBandwidth (uint8_t ulBandwidth, uint8_t dlBandwidth) +UeMemberLteUePhySapProvider::SetBandwidth (uint8_t ulBandwidth, uint8_t dlBandwidth) { m_phy->DoSetBandwidth (ulBandwidth, dlBandwidth); } void -UeMemberUeLtePhySapProvider::SendIdealControlMessage (Ptr msg) +UeMemberLteUePhySapProvider::SendIdealControlMessage (Ptr msg) { m_phy->DoSendIdealControlMessage (msg); } @@ -87,58 +87,58 @@ UeMemberUeLtePhySapProvider::SendIdealControlMessage (Ptr m //////////////////////////////////////// -// generic UeLtePhy methods +// generic LteUePhy methods //////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (UeLtePhy); +NS_OBJECT_ENSURE_REGISTERED (LteUePhy); -UeLtePhy::UeLtePhy () +LteUePhy::LteUePhy () : m_p10CqiPeriocity (MilliSeconds (2)), m_p10CqiLast (MilliSeconds (0)) { - m_uePhySapProvider = new UeMemberUeLtePhySapProvider (this); + m_uePhySapProvider = new UeMemberLteUePhySapProvider (this); } -UeLtePhy::~UeLtePhy () +LteUePhy::~LteUePhy () { } void -UeLtePhy::DoDispose () +LteUePhy::DoDispose () { } TypeId -UeLtePhy::GetTypeId (void) +LteUePhy::GetTypeId (void) { - static TypeId tid = TypeId ("ns3::UeLtePhy") + static TypeId tid = TypeId ("ns3::LteUePhy") .SetParent () - .AddConstructor () + .AddConstructor () ; return tid; } void -UeLtePhy::SetLteUePhySapUser (LteUePhySapUser* s) +LteUePhy::SetLteUePhySapUser (LteUePhySapUser* s) { m_uePhySapUser = s; } LteUePhySapProvider* -UeLtePhy::GetLteUePhySapProvider () +LteUePhy::GetLteUePhySapProvider () { return (m_uePhySapProvider); } void -UeLtePhy::DoSendMacPdu (Ptr p) +LteUePhy::DoSendMacPdu (Ptr p) { NS_LOG_FUNCTION (this); @@ -147,13 +147,13 @@ UeLtePhy::DoSendMacPdu (Ptr p) void -UeLtePhy::PhyPduReceived (Ptr p) +LteUePhy::PhyPduReceived (Ptr p) { m_uePhySapUser->ReceivePhyPdu (p); } void -UeLtePhy::DoSetUplinkSubChannels () +LteUePhy::DoSetUplinkSubChannels () { NS_LOG_FUNCTION (this); @@ -166,7 +166,7 @@ UeLtePhy::DoSetUplinkSubChannels () void -UeLtePhy::SetSubChannelsForTransmission (std::vector mask) +LteUePhy::SetSubChannelsForTransmission (std::vector mask) { NS_LOG_FUNCTION (this); @@ -178,7 +178,7 @@ UeLtePhy::SetSubChannelsForTransmission (std::vector mask) void -UeLtePhy::SetSubChannelsForReception (std::vector mask) +LteUePhy::SetSubChannelsForReception (std::vector mask) { NS_LOG_FUNCTION (this); m_subChannelsForReception = mask; @@ -186,7 +186,7 @@ UeLtePhy::SetSubChannelsForReception (std::vector mask) std::vector -UeLtePhy::GetSubChannelsForTransmission () +LteUePhy::GetSubChannelsForTransmission () { NS_LOG_FUNCTION (this); return m_subChannelsForTransmission; @@ -194,7 +194,7 @@ UeLtePhy::GetSubChannelsForTransmission () std::vector -UeLtePhy::GetSubChannelsForReception () +LteUePhy::GetSubChannelsForReception () { NS_LOG_FUNCTION (this); return m_subChannelsForReception; @@ -202,7 +202,7 @@ UeLtePhy::GetSubChannelsForReception () Ptr -UeLtePhy::CreateTxPowerSpectralDensity () +LteUePhy::CreateTxPowerSpectralDensity () { NS_LOG_FUNCTION (this); LteSpectrumValueHelper psdHelper; @@ -212,12 +212,12 @@ UeLtePhy::CreateTxPowerSpectralDensity () } void -UeLtePhy::GenerateCqiFeedback (const SpectrumValue& sinr) +LteUePhy::GenerateCqiFeedback (const SpectrumValue& sinr) { NS_LOG_FUNCTION (this); if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity) { - Ptr thisDevice = GetDevice ()->GetObject (); + Ptr thisDevice = GetDevice ()->GetObject (); Ptr msg = CreateDlCqiFeedbackMessage (sinr); DoSendIdealControlMessage (msg); m_p10CqiLast = Simulator::Now (); @@ -227,11 +227,11 @@ UeLtePhy::GenerateCqiFeedback (const SpectrumValue& sinr) Ptr -UeLtePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr) +LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr) { NS_LOG_FUNCTION (this); - std::vector cqi = AmcModule::CreateCqiFeedbacks (sinr); + std::vector cqi = LteAmc::CreateCqiFeedbacks (sinr); // CREATE CqiIdealControlMessage Ptr msg = Create (); @@ -257,11 +257,11 @@ UeLtePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr) void -UeLtePhy::DoSendIdealControlMessage (Ptr msg) +LteUePhy::DoSendIdealControlMessage (Ptr msg) { NS_LOG_FUNCTION (this << msg); - Ptr thisDevice = GetDevice ()->GetObject (); - Ptr remoteDevice = thisDevice->GetTargetEnb (); + Ptr thisDevice = GetDevice ()->GetObject (); + Ptr remoteDevice = thisDevice->GetTargetEnb (); msg->SetSourceDevice (thisDevice); msg->SetDestinationDevice (remoteDevice); SetControlMessages (msg); @@ -271,7 +271,7 @@ UeLtePhy::DoSendIdealControlMessage (Ptr msg) void -UeLtePhy::ReceiveIdealControlMessage (Ptr msg) +LteUePhy::ReceiveIdealControlMessage (Ptr msg) { NS_LOG_FUNCTION (this << msg); @@ -333,7 +333,7 @@ UeLtePhy::ReceiveIdealControlMessage (Ptr msg) void -UeLtePhy::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) +LteUePhy::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) { // trigger from eNB @@ -341,7 +341,7 @@ UeLtePhy::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) std::list > ctrlMsg = GetControlMessages (); if (ctrlMsg.size () > 0) { - Ptr phy = GetDevice ()->GetObject ()->GetTargetEnb ()->GetPhy (); + Ptr phy = GetDevice ()->GetObject ()->GetTargetEnb ()->GetPhy (); std::list >::iterator it; it = ctrlMsg.begin (); while (it != ctrlMsg.end ()) @@ -365,7 +365,7 @@ UeLtePhy::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) void -UeLtePhy::SetTargetEnb (Ptr enbPhy) +LteUePhy::SetTargetEnb (Ptr enbPhy) { m_targetEnbPhy = enbPhy; } @@ -373,7 +373,7 @@ UeLtePhy::SetTargetEnb (Ptr enbPhy) void -UeLtePhy::SetRnti (uint16_t rnti) +LteUePhy::SetRnti (uint16_t rnti) { NS_LOG_FUNCTION (this << rnti); m_rnti = rnti; diff --git a/src/lte/model/ue-phy.h b/src/lte/model/lte-ue-phy.h similarity index 92% rename from src/lte/model/ue-phy.h rename to src/lte/model/lte-ue-phy.h index affbc34d3..d33b6d77b 100644 --- a/src/lte/model/ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -19,15 +19,15 @@ * Author: Marco Miozzo */ -#ifndef UE_PHY_H -#define UE_PHY_H +#ifndef LTE_UE_PHY_H +#define LTE_UE_PHY_H #include #include #include -#include +#include #include #include @@ -36,20 +36,20 @@ namespace ns3 { class PacketBurst; class LteNetDevice; -class EnbLtePhy; +class LteEnbPhy; /** * The LteSpectrumPhy models the physical layer of LTE */ -class UeLtePhy : public LtePhy +class LteUePhy : public LtePhy { - friend class UeMemberUeLtePhySapProvider; + friend class UeMemberLteUePhySapProvider; public: - UeLtePhy (); - virtual ~UeLtePhy (); + LteUePhy (); + virtual ~LteUePhy (); virtual void DoDispose (); static TypeId GetTypeId (void); @@ -150,7 +150,7 @@ public: * \param enbPhy a pointer to the PHY of the eNB, used for exchanging control messages * \param cellId the cell identifier of the eNB */ - void SetTargetEnb (Ptr enbPhy); + void SetTargetEnb (Ptr enbPhy); private: @@ -165,7 +165,7 @@ private: uint16_t m_rnti; - Ptr m_targetEnbPhy; + Ptr m_targetEnbPhy; uint16_t m_cellId; }; @@ -173,4 +173,4 @@ private: } -#endif /* UE_PHY_H */ +#endif /* LTE_UE_PHY_H */ diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index bd927eec5..9fc1ab2f7 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -21,7 +21,7 @@ #include #include -#include "amc-module.h" +#include "lte-amc.h" #include "rr-ff-mac-scheduler.h" NS_LOG_COMPONENT_DEFINE ("RrPacketScheduler"); @@ -430,10 +430,10 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched } else { - newDci.m_mcs.push_back ( AmcModule::GetMcsFromCqi ((*it).second) ); + newDci.m_mcs.push_back ( LteAmc::GetMcsFromCqi ((*it).second) ); } int nPRB = rbgSize * rbgPerFlow; - newDci.m_tbsSize.push_back ( (AmcModule::GetTbSizeFromMcs (newDci.m_mcs.at (i), nPRB) / 8) ); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) + newDci.m_tbsSize.push_back ( (LteAmc::GetTbSizeFromMcs (newDci.m_mcs.at (i), nPRB) / 8) ); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213) newDci.m_ndi.push_back (1); // TBD (new data indicator) newDci.m_rv.push_back (0); // TBD (redundancy version) @@ -549,7 +549,7 @@ RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched uldci.m_rbLen = rbPerFlow; rbAllocated += rbPerFlow; uldci.m_mcs = 0; // MCS 0 -> UL-AMC TBD - uldci.m_tbSize = (AmcModule::GetTbSizeFromMcs (uldci.m_mcs, rbPerFlow) / 8); // MCS 0 -> UL-AMC TBD + uldci.m_tbSize = (LteAmc::GetTbSizeFromMcs (uldci.m_mcs, rbPerFlow) / 8); // MCS 0 -> UL-AMC TBD uldci.m_ndi = 1; uldci.m_cceIndex = 0; uldci.m_aggrLevel = 1; diff --git a/src/lte/wscript b/src/lte/wscript index 83279b9b5..d4afb8bec 100644 --- a/src/lte/wscript +++ b/src/lte/wscript @@ -6,8 +6,8 @@ def build(bld): module.source = [ 'model/lte-spectrum-phy.cc', 'model/lte-phy.cc', - 'model/enb-phy.cc', - 'model/ue-phy.cc', + 'model/lte-enb-phy.cc', + 'model/lte-ue-phy.cc', 'model/lte-spectrum-value-helper.cc', 'model/lte-propagation-loss-model.cc', 'model/discrete-time-loss-model.cc', @@ -16,14 +16,14 @@ def build(bld): 'model/path-loss-model.cc', 'model/jakes-fading-loss-model.cc', 'model/channel-realization.cc', - 'model/amc-module.cc', + 'model/lte-amc.cc', 'model/lte-enb-rrc.cc', 'model/lte-ue-rrc.cc', 'model/lte-rlc.cc', 'model/eps-bearer.cc', 'model/lte-net-device.cc', - 'model/enb-net-device.cc', - 'model/ue-net-device.cc', + 'model/lte-enb-net-device.cc', + 'model/lte-ue-net-device.cc', 'model/ideal-control-messages.cc', 'helper/lena-helper.cc', 'model/ff-mac-csched-sap.cc', @@ -45,8 +45,8 @@ def build(bld): headers.source = [ 'model/lte-spectrum-phy.h', 'model/lte-phy.h', - 'model/enb-phy.h', - 'model/ue-phy.h', + 'model/lte-enb-phy.h', + 'model/lte-ue-phy.h', 'model/lte-spectrum-value-helper.h', 'model/lte-propagation-loss-model.h', 'model/discrete-time-loss-model.h', @@ -55,14 +55,14 @@ def build(bld): 'model/path-loss-model.h', 'model/jakes-fading-loss-model.h', 'model/channel-realization.h', - 'model/amc-module.h', + 'model/lte-amc.h', 'model/lte-enb-rrc.h', 'model/lte-ue-rrc.h', 'model/lte-rlc.h', 'model/eps-bearer.h', 'model/lte-net-device.h', - 'model/enb-net-device.h', - 'model/ue-net-device.h', + 'model/lte-enb-net-device.h', + 'model/lte-ue-net-device.h', 'model/ideal-control-messages.h', 'helper/lena-helper.h', 'model/ff-mac-common.h',