merge
authorMarco Miozzo <marco.miozzo@cttc.es>
Mon, 17 Dec 2012 17:40:33 +0100
changeset 9566 27ae6d9e0590
parent 9565 86b1cbca3740 (current diff)
parent 9564 6a07929995e2 (diff)
child 9567 6941db633724
merge
--- a/src/lte/model/lte-enb-rrc.cc	Mon Dec 17 17:31:09 2012 +0100
+++ b/src/lte/model/lte-enb-rrc.cc	Mon Dec 17 17:40:33 2012 +0100
@@ -155,7 +155,7 @@
   m_physicalConfigDedicated.haveSoundingRsUlConfigDedicated = true;
   m_physicalConfigDedicated.soundingRsUlConfigDedicated.srsConfigIndex = m_rrc->GetNewSrsConfigurationIndex ();
   m_physicalConfigDedicated.soundingRsUlConfigDedicated.type = LteRrcSap::SoundingRsUlConfigDedicated::SETUP;
-  m_physicalConfigDedicated.soundingRsUlConfigDedicated.srsBandwidth = 1;
+  m_physicalConfigDedicated.soundingRsUlConfigDedicated.srsBandwidth = 0;
 
   m_rrc->m_cmacSapProvider->AddUe (m_rnti);
   m_rrc->m_cphySapProvider->AddUe (m_rnti);
@@ -468,12 +468,12 @@
         hpi.asConfig.sourceUeIdentity = m_rnti;
         hpi.asConfig.sourceDlCarrierFreq = m_rrc->m_dlEarfcn;
         hpi.asConfig.sourceRadioResourceConfig = GetRadioResourceConfigForHandoverPreparationInfo ();
-        hpi.asConfig.sourceMasterInformationBlock.dlBandwidth = 1;
-        hpi.asConfig.sourceMasterInformationBlock.systemFrameNumber = 1;
-        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity = 1;
-        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.cellIdentity = cellId;
-        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIndication = 1;
-        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity = 1;
+        hpi.asConfig.sourceMasterInformationBlock.dlBandwidth = m_rrc->m_dlBandwidth;
+        hpi.asConfig.sourceMasterInformationBlock.systemFrameNumber = 0;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.plmnIdentityInfo.plmnIdentity = 0;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.cellIdentity = m_rrc->m_cellId;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIndication = 0;
+        hpi.asConfig.sourceSystemInformationBlockType1.cellAccessRelatedInfo.csgIdentity = 0;
         params.rrcContext = m_rrc->m_rrcSapUser->EncodeHandoverPreparationInformation (hpi);
   
         NS_LOG_LOGIC ("oldEnbUeX2apId = " << params.oldEnbUeX2apId);