Attachment #2984 for bug #2840

View | Details | Raw Unified | Return to bug 2840
Collapse All | Expand All




                   UintegerValue (1),
                   MakeUintegerAccessor (&LteHelper::m_noOfCcs),
                   MakeUintegerChecker<uint16_t> (MIN_NO_CC, MAX_NO_CC))
   .AddAttribute ("UeUlCcBandwidth",
                   "Uplink Transmission Bandwidth Configuration in number of Resource Blocks",
                   UintegerValue (25),
                   MakeUintegerAccessor (&LteHelper::m_ulCcBw),
                   MakeUintegerChecker<uint8_t> ())
    .AddAttribute ("UeDlCcBandwidth",
                   "Downlink Transmission Bandwidth Configuration in number of Resource Blocks",
                   UintegerValue (25),
                   MakeUintegerAccessor (&LteHelper::m_dlCcBw),
                   MakeUintegerChecker<uint8_t> ())
    .AddAttribute ("UeUlCcEarfcn",
                   "Uplink E-UTRA Absolute Radio Frequency Channel Number (EARFCN) "
                   "as per 3GPP 36.101 Section 5.7.3. ",
                   UintegerValue (18100),
                   MakeUintegerAccessor (&LteHelper::m_ulCcEarfcn),
                   MakeUintegerChecker<uint32_t> (0, 262143))
  ;
  return tid;
}

  Ptr<LteEnbNetDevice> dev = m_enbNetDeviceFactory.Create<LteEnbNetDevice> ();
  Ptr<LteHandoverAlgorithm> handoverAlgorithm = m_handoverAlgorithmFactory.Create<LteHandoverAlgorithm> ();

/*  if (m_componentCarrierPhyParams.size() == 0)
    {
      DoComponentCarrierConfigure (dev->GetUlEarfcn (), dev->GetDlEarfcn (), dev->GetUlBandwidth (), dev->GetDlBandwidth ());
    }*/

  Ptr<CcHelper> ccHelper = CreateObject<CcHelper> ();
  ccHelper->SetNumberOfComponentCarriers (m_noOfCcs);
  ccHelper->SetUlEarfcn (dev->GetUlEarfcn ());
  ccHelper->SetDlEarfcn (dev->GetDlEarfcn ());
  ccHelper->SetDlBandwidth (dev->GetUlBandwidth ());
  ccHelper->SetUlBandwidth (dev->GetDlBandwidth ());
  m_componentCarrierPhyParams = ccHelper->EquallySpacedCcs ();
  m_componentCarrierPhyParams.at(0).SetAsPrimary(true);

  NS_ASSERT_MSG(m_componentCarrierPhyParams.size()!=0, "Cannot create enb ccm map.");
  // create component carrier map for this eNb device

      rrc->SetEpcX2SapProvider (x2->GetEpcX2SapProvider ());
    }

 m_componentCarrierPhyParams.clear();

  return dev;
}


{
  NS_LOG_FUNCTION (this);

  //NS_ABORT_MSG_IF (m_componentCarrierPhyParams.size() == 0 && m_useCa, "If CA is enabled, before call this method you need to install Enbs --> InstallEnbDevice()");

  if(m_noOfCcs>1)
    {
      NS_LOG_WARN("User should remember to set the attributes, UeUlCcBandwidth, UeDlCcBandwidth and UeUlCcEarfcn for UE's primary component carrier. Else default values will be used");
    } 

  Ptr<LteUeNetDevice> dev = m_ueNetDeviceFactory.Create<LteUeNetDevice> ();
  std::map<uint8_t, Ptr<ComponentCarrierUe> > ueCcMap;

  Ptr<CcHelper> ccHelper = CreateObject<CcHelper> ();
  ccHelper->SetNumberOfComponentCarriers (m_noOfCcs);
  ccHelper->SetUlEarfcn (m_ulCcEarfcn);
  ccHelper->SetDlEarfcn (dev->GetDlEarfcn ());
  ccHelper->SetDlBandwidth (m_ulCcBw);
  ccHelper->SetUlBandwidth (m_dlCcBw);
  m_componentCarrierPhyParams = ccHelper->EquallySpacedCcs ();
  m_componentCarrierPhyParams.at(0).SetAsPrimary(true);

  for (std::map< uint8_t, ComponentCarrier >::iterator it = m_componentCarrierPhyParams.begin() ; it != m_componentCarrierPhyParams.end(); ++it)
    {
      Ptr <ComponentCarrierUe> cc =  CreateObject<ComponentCarrierUe> ();


  dev->Initialize ();

  m_componentCarrierPhyParams.clear();
  ueCcMap.clear();
  return dev;
}


(-)a/src/lte/helper/lte-helper.h (+6 lines)

Lines 855-860	Link Here

855

*/

855

*/

856

  uint16_t m_noOfCcs;

856

  uint16_t m_noOfCcs;

857

858

  uint8_t m_ulCcBw;

859

860

  uint8_t m_dlCcBw;

861

862

  uint32_t m_ulCcEarfcn;

863

858

};   // end of `class LteHelper`

864

};   // end of `class LteHelper`

859

865

860

866

Return to bug 2840