lte: (fixes #2979) remove unused variables and functions from UE RRC and UE CCM

src/lte/model/lte-ue-ccm-rrc-sap.h

@@ -139,7 +139,8 @@ std::vector<LteUeCcmRrcSapProvider::LcsConfig> MemberLteUeCcmRrcSapProvider<C>::
 template <class C>
 void MemberLteUeCcmRrcSapProvider<C>::NotifyConnectionReconfigurationMsg ()
 {
-  m_owner->DoNotifyConnectionReconfigurationMsg ();
+  NS_FATAL_ERROR ("Function should not be called because it is not implemented.");
+  //m_owner->DoNotifyConnectionReconfigurationMsg ();
 }
 
 
@@ -199,7 +200,8 @@ MemberLteUeCcmRrcSapUser<C>::MemberLteUeCcmRrcSapUser (C* owner)
 template <class C>
 void MemberLteUeCcmRrcSapUser<C>::ComponentCarrierEnabling (std::vector<uint8_t> componentCarrierList)
 {
-  m_owner->DoComponentCarrierEnabling (componentCarrierList);
+  NS_FATAL_ERROR ("Function should not be called because it is not implemented.");
+  //m_owner->DoComponentCarrierEnabling (componentCarrierList);
 }
   
 } // end of namespace ns3

src/lte/model/lte-ue-component-carrier-manager.cc

@@ -28,6 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("LteUeComponentCarrierManager");
 NS_OBJECT_ENSURE_REGISTERED (LteUeComponentCarrierManager);
 
 LteUeComponentCarrierManager::LteUeComponentCarrierManager ()
+:m_noOfComponentCarriers(0)
 {
 }
 
@@ -77,6 +78,7 @@ void
 LteUeComponentCarrierManager::SetNumberOfComponentCarriers (uint8_t noOfComponentCarriers)
 {
   NS_LOG_FUNCTION (this);
+  NS_ABORT_MSG_IF (noOfComponentCarriers < MIN_NO_CC || noOfComponentCarriers > MAX_NO_CC, "Number of component carriers should be greater than 0 and less than 6");
   m_noOfComponentCarriers = noOfComponentCarriers;
 }
 

src/lte/model/lte-ue-component-carrier-manager.h

@@ -29,6 +29,9 @@
 #include <map>
 #include <vector>
 
+#define MIN_NO_CC 1
+#define MAX_NO_CC 5 // this is the maximum number of carrier components allowed by 3GPP up to R13
+
 namespace ns3 {
 
 
@@ -89,7 +92,7 @@ public:
 
   /**
    * \brief Sets number of component carriers that are supported by this UE.
-   * \param noOfComponentCarriers numbr of component carriers
+   * \param noOfComponentCarriers number of component carriers
    */
   void SetNumberOfComponentCarriers (uint8_t noOfComponentCarriers);
 
@@ -101,7 +104,6 @@ protected:
   std::map<uint8_t, LteMacSapUser*> m_lcAttached; //!< Map of pointers to SAP interfaces of the RLC instance of the flows of this UE.
   std::map<uint8_t, std::map<uint8_t, LteMacSapProvider*> > m_componentCarrierLcMap; //!< Flow configuration per flow Id of this UE.
   uint16_t m_noOfComponentCarriers; //!<// The number of component carriers that this UE can support.
-  uint16_t m_noOfComponentCarriersEnabled; //!< The number of enabled component carriers that are enabled for this UE.
   std::map <uint8_t, LteMacSapProvider*> m_macSapProvidersMap; //!< Map of pointers to SAP to interfaces of the MAC instance if the flows of this UE.
 
 }; // end of class LteUeComponentCarrierManager

src/lte/model/lte-ue-rrc.cc

@@ -3034,11 +3034,6 @@ LteUeRrc::SwitchToState (State newState)
     }
 }
 
-void
-LteUeRrc::DoComponentCarrierEnabling (std::vector<uint8_t> res)
-  {
-    NS_LOG_INFO (this);
-  }
 
 void
 LteUeRrc::SaveScellUeMeasurements (uint16_t sCellId, double rsrp, double rsrq,

src/lte/model/lte-ue-rrc.h

@@ -484,12 +484,6 @@ private:
    */
   void DoRecvRrcConnectionReject (LteRrcSap::RrcConnectionReject msg);
 
-  /**
-   * RRC CCM SAP USER Method
-   * \param res
-   */
-  void DoComponentCarrierEnabling (std::vector<uint8_t> res);
-
  
   // INTERNAL METHODS
 

src/lte/model/simple-ue-component-carrier-manager.cc

@@ -133,7 +133,6 @@ SimpleUeComponentCarrierManager::SimpleUeComponentCarrierManager ()
 {
   NS_LOG_FUNCTION (this);
   m_ccmRrcSapProvider = new MemberLteUeCcmRrcSapProvider<SimpleUeComponentCarrierManager> (this);
-  m_noOfComponentCarriersEnabled = 1;
   m_ccmMacSapUser = new SimpleUeCcmMacSapUser (this);
   m_ccmMacSapProvider = new SimpleUeCcmMacSapProvider (this);
 }
@@ -289,7 +288,7 @@ SimpleUeComponentCarrierManager::DoAddLc (uint8_t lcId,  LteUeCmacSapProvider::L
   m_lcAttached.insert (std::pair<uint8_t, LteMacSapUser*> (lcId, msu));
   LteUeCcmRrcSapProvider::LcsConfig elem;
   std::map <uint8_t, std::map<uint8_t, LteMacSapProvider*> >::iterator ccLcMapIt;
-  for (uint8_t ncc = 0; ncc < m_noOfComponentCarriersEnabled; ncc++)
+  for (uint8_t ncc = 0; ncc < m_noOfComponentCarriers; ncc++)
     {
       elem.componentCarrierId = ncc;
       elem.lcConfig = &lcConfig;
@@ -316,23 +315,6 @@ SimpleUeComponentCarrierManager::DoAddLc (uint8_t lcId,  LteUeCmacSapProvider::L
   return res;  
 }
 
-void
-SimpleUeComponentCarrierManager::DoNotifyConnectionReconfigurationMsg ()
-{
-  NS_LOG_FUNCTION (this);
-  // this method need to be extended, now support only up to 2 ComponentCarrier Simulations
-
-  if (m_noOfComponentCarriersEnabled < m_noOfComponentCarriers)
-   {
-     // new ComponentCarrierConfiguration Requested
-     m_noOfComponentCarriersEnabled++;
-     std::vector<uint8_t> res;
-     res.insert (res.end (), m_noOfComponentCarriersEnabled);
-     //here the code to update all the Lc, since now  those should be mapped on all ComponentCarriers
-     m_ccmRrcSapUser->ComponentCarrierEnabling (res);
-   }
-  
-}
 LteMacSapUser*
 SimpleUeComponentCarrierManager::DoConfigureSignalBearer (uint8_t lcid,  LteUeCmacSapProvider::LogicalChannelConfig lcConfig, LteMacSapUser* msu)
 {

src/lte/model/simple-ue-component-carrier-manager.h

@@ -125,8 +125,6 @@ protected:
    * \returns updated LC list
    */
   std::vector<uint16_t> DoRemoveLc (uint8_t lcid);
-  /// Notify connection reconfiguration message
-  void DoNotifyConnectionReconfigurationMsg ();
   /**
    * \brief Configure signal bearer function
    * \param lcId the LCID