Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1656)

Unified Diff: src/lte/model/lte-ue-rrc.h

Issue 250600043: GSoC 2015 - Carrier Aggregation - Control Plane
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/lte/model/lte-ue-net-device.cc ('k') | src/lte/model/lte-ue-rrc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/lte/model/lte-ue-rrc.h
===================================================================
--- a/src/lte/model/lte-ue-rrc.h
+++ b/src/lte/model/lte-ue-rrc.h
@@ -31,6 +31,7 @@
#include <ns3/lte-rrc-sap.h>
#include <ns3/traced-callback.h>
#include "ns3/component-carrier-ue.h"
+#include <ns3/lte-ccm-rrc-sap.h>
#include <vector>
#include <map>
@@ -145,6 +146,7 @@
* \param s the CMAC SAP Provider to be used by this RRC
*/
void SetLteUeCmacSapProvider (LteUeCmacSapProvider * s);
+ void SetLteUeCmacSapProvider (LteUeCmacSapProvider * s, uint16_t index);
/**
*
@@ -152,6 +154,7 @@
* \return s the CMAC SAP User interface offered to the MAC by this RRC
*/
LteUeCmacSapUser* GetLteUeCmacSapUser ();
+ LteUeCmacSapUser* GetLteUeCmacSapUser (uint16_t indec);
/**
@@ -191,6 +194,20 @@
*/
LteAsSapProvider* GetAsSapProvider ();
+ /**
+ * set the Component Carrier Management SAP this RRC should interact with
+ *
+ * \param s the Component Carrier Management SAP Provider to be used by this RRC
+ */
+ void SetLteCcmRrcSapProvider (LteCcmRrcSapProvider * s);
+
+ /**
+ * Get the Component Carrier Management SAP offered by this RRC
+ * \return s the Component Carrier Management SAP User interface offered to the
+ * carrier component selection algorithm by this RRC
+ */
+ LteCcmRrcSapUser* GetLteCcmRrcSapUser ();
+
/**
*
* \param imsi the unique UE identifier
@@ -258,7 +275,7 @@
*
* \return support CA
*/
- uint64_t GetCaSupport (void) const;
+ bool GetCaSupport (void) const;
/**
@@ -538,8 +555,8 @@
std::vector<LteUeCphySapProvider*> m_cphySapProvider;
- LteUeCmacSapUser* m_cmacSapUser;
- LteUeCmacSapProvider* m_cmacSapProvider;
+ std::vector<LteUeCmacSapUser*> m_cmacSapUser;
+ std::vector<LteUeCmacSapProvider*> m_cmacSapProvider;
LteUeRrcSapUser* m_rrcSapUser;
LteUeRrcSapProvider* m_rrcSapProvider;
@@ -550,6 +567,12 @@
LteAsSapProvider* m_asSapProvider;
LteAsSapUser* m_asSapUser;
+ /// Receive API calls from the LteUeComponetCarrierManager instance.
+ LteCcmRrcSapUser* m_ccmRrcSapUser;
+ /// Interface to the LteUeComponetCarrierManage instance.
+ LteCcmRrcSapProvider* m_ccmRrcSapProvider;
+
+
/// The current UE RRC state.
State m_state;
« no previous file with comments | « src/lte/model/lte-ue-net-device.cc ('k') | src/lte/model/lte-ue-rrc.cc » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b