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

lte: Make sure CC spacing is multiple of 300kHz

Browse Source
This commit is contained in:
Alexander Krotov
2017-07-04 07:25:02 +03:00
parent e9ba48da92
commit cd1cf7003c
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/lte/helper/cc-helper.cc
View File

@@ -27,6 +27,7 @@
#include <ns3/pointer.h>
#include <iostream>
#include <ns3/uinteger.h>
#include <ns3/lte-spectrum-value-helper.h>
#define MIN_CC 1
#define MAX_CC 2
@@ -172,22 +173,46 @@ CcHelper::EquallySpacedCcs ()
{
std::map< uint8_t, ComponentCarrier > ccmap;
uint32_t ulEarfcn = m_ulEarfcn;
uint32_t dlEarfcn = m_dlEarfcn;
uint32_t maxBandwidthRb = std::max<uint32_t> (m_ulBandwidth, m_dlBandwidth);
// Convert bandwidth from RBs to kHz
uint32_t maxBandwidthKhz = LteSpectrumValueHelper::GetChannelBandwidth(maxBandwidthRb) / 1e3;
for (uint8_t i = 0; i < m_numberOfComponentCarriers; i++)
{
// Make sure we stay within the same band.
if (LteSpectrumValueHelper::GetUplinkCarrierBand (ulEarfcn) !=
LteSpectrumValueHelper::GetUplinkCarrierBand (m_ulEarfcn)
|| LteSpectrumValueHelper::GetDownlinkCarrierBand (dlEarfcn) !=
LteSpectrumValueHelper::GetDownlinkCarrierBand (m_dlEarfcn))
{
NS_FATAL_ERROR ("Band is not wide enough to allocate " << +m_numberOfComponentCarriers << " CCs");
}
bool pc =false;
// One RB is 200 kHz wide, while increment by 1 in corresponds to 100 kHz shift
// Therefore, we need to multiply by 2 here.
uint32_t ul = m_ulEarfcn + i * 2 * m_ulBandwidth;
uint32_t dl = m_dlEarfcn + i * 2 * m_dlBandwidth;
if (i == 0)
{
pc = true;
}
ComponentCarrier cc = CreateSingleCc (m_ulBandwidth, m_dlBandwidth, ul, dl, pc);
ComponentCarrier cc = CreateSingleCc (m_ulBandwidth, m_dlBandwidth, ulEarfcn, dlEarfcn, pc);
ccmap.insert (std::pair<uint8_t, ComponentCarrier >(i, cc));
NS_LOG_INFO(" ulBandwidth:"<<m_ulBandwidth<<" , dlBandwidth: "<<m_dlBandwidth<<" , ul:"<<ul<<" , dl:"<<dl);
NS_LOG_INFO("ulBandwidth: " << m_ulBandwidth <<
", dlBandwidth: " << m_dlBandwidth <<
", ulEarfcn: " << ulEarfcn <<
", dlEarfcn: " << dlEarfcn);
// The spacing between the centre frequencies of two contiguous CCs should be multiple of 300 kHz.
// Round spacing up to 300 kHz.
uint32_t frequencyShift = 300 * (1 + (maxBandwidthKhz - 1) / 300);
// Unit of EARFCN corresponds to 100kHz.
uint32_t earfcnShift = frequencyShift / 100;
ulEarfcn += earfcnShift;
dlEarfcn += earfcnShift;
}
return ccmap;