diff --git a/doc/manual/manual.texi b/doc/manual/manual.texi index a465448c9..69cbdc862 100644 --- a/doc/manual/manual.texi +++ b/doc/manual/manual.texi @@ -107,6 +107,7 @@ Simulator version: * Wifi NetDevice:: * Mesh NetDevice:: * Bridge NetDevice:: +* LTE Module:: * Wimax NetDevice:: * Emulation:: * Emu NetDevice:: @@ -157,6 +158,7 @@ Simulator version: @include wifi.texi @include mesh.texi @include bridge.texi +@include lte.texi @include wimax.texi @unnumbered Part 3: Emulation diff --git a/src/devices/spectrum/multi-model-spectrum-channel.cc b/src/devices/spectrum/multi-model-spectrum-channel.cc index 1342662e2..1577721ec 100644 --- a/src/devices/spectrum/multi-model-spectrum-channel.cc +++ b/src/devices/spectrum/multi-model-spectrum-channel.cc @@ -342,5 +342,12 @@ MultiModelSpectrumChannel::SetPropagationDelayModel (Ptr m_PropagationDelay = delay; } +Ptr +MultiModelSpectrumChannel::GetSpectrumPropagationLossModel (void) +{ + NS_LOG_FUNCTION (this); + return m_PropagationLoss; +} + } // namespace ns3 diff --git a/src/devices/spectrum/multi-model-spectrum-channel.h b/src/devices/spectrum/multi-model-spectrum-channel.h index 0f79034a7..10b2c2868 100644 --- a/src/devices/spectrum/multi-model-spectrum-channel.h +++ b/src/devices/spectrum/multi-model-spectrum-channel.h @@ -88,6 +88,8 @@ public: virtual uint32_t GetNDevices (void) const; virtual Ptr GetDevice (uint32_t i) const; + virtual Ptr GetSpectrumPropagationLossModel (void); + protected: void DoDispose (); diff --git a/src/devices/spectrum/single-model-spectrum-channel.cc b/src/devices/spectrum/single-model-spectrum-channel.cc index 66dc10ed4..1daf52524 100644 --- a/src/devices/spectrum/single-model-spectrum-channel.cc +++ b/src/devices/spectrum/single-model-spectrum-channel.cc @@ -204,12 +204,12 @@ SingleModelSpectrumChannel::SetPropagationDelayModel (Ptr } - - - - - - +Ptr +SingleModelSpectrumChannel::GetSpectrumPropagationLossModel (void) +{ + NS_LOG_FUNCTION (this); + return m_PropagationLoss; +} } // namespace ns3 diff --git a/src/devices/spectrum/single-model-spectrum-channel.h b/src/devices/spectrum/single-model-spectrum-channel.h index c2e771608..c1e2000ae 100644 --- a/src/devices/spectrum/single-model-spectrum-channel.h +++ b/src/devices/spectrum/single-model-spectrum-channel.h @@ -62,6 +62,7 @@ public: typedef std::vector > PhyList; + virtual Ptr GetSpectrumPropagationLossModel (void); private: @@ -70,7 +71,6 @@ private: /** * used internally to reschedule transmission after the propagation delay * - * * @param p * @param rxPowerSpectrum * @param st diff --git a/src/node/spectrum-channel.h b/src/node/spectrum-channel.h index 0f828ad49..e49d638b7 100644 --- a/src/node/spectrum-channel.h +++ b/src/node/spectrum-channel.h @@ -54,6 +54,8 @@ public: */ virtual void AddSpectrumPropagationLossModel (Ptr loss) = 0; + virtual Ptr GetSpectrumPropagationLossModel (void) = 0; + /** * set the propagation delay model to be used * \param delay Ptr to the propagation delay model to be used. @@ -65,11 +67,10 @@ public: * Used by attached PHY instances to transmit waveforms on the channel * * @param p the PacketBurst associated with the waveform being transmitted - * @param txPsd the Power Spectral Density of the + * @param txPowerSpectrum the Power Spectral Density of the * waveform, in linear units. The exact unit will depend on the * type of transmission medium involved: W for radio communications, Pa for * underwater acoustic communications. Other transmission media to be defined. - * @param st spectrum type * @param duration duration of the packet transmission. It is * assumed that the Power Spectral Density remains constant for the * whole duration of the transmission. In other words, all waveform diff --git a/src/wscript b/src/wscript index 36c08f6b2..24a586334 100644 --- a/src/wscript +++ b/src/wscript @@ -59,6 +59,7 @@ all_modules = ( 'contrib/flow-monitor', 'applications/udp-client-server', 'devices/wimax', + 'devices/lte', 'mpi', 'contrib/topology-read', 'contrib/energy',