lte: Move {MIN,MAX}_NO_CC constants to lte-common.h

CHANGES.md

@@ -63,6 +63,7 @@ Changes from ns-3.38 to ns-3-dev
 * (lte) Add support for DC-GBR. The member `QosBearerType_e` of the structure `LogicalChannelConfigListElement_s` is extended to include DC-GBR resource type. Based on this change, the method **IsGbr** of `EpsBearer`, is renamed to **GetResourceType**. LTE code using this method, is updated according to this change.
 * (lte) The `EpsBearer` is extended to include 3GPP Release 18 5QIs.
 * (lte) Add PDCP discard timer. If enabled using the attribute `EnablePdcpDiscarding`, in case that the buffering time (head-of-line delay) of a packet is greater than the PDB or a value set by the user, it will perform discarding at the moment of passing the PDCP SDU to RLC.
+* (lte) Centralize the constants `MIN_NO_CC` and `MAX_NO_CC`, declared in multiple header files, into the header `lte-common.h`.
 
 ### Changes to build system
 

src/lte/helper/lte-helper.cc

@@ -35,6 +35,7 @@
 #include <ns3/log.h>
 #include <ns3/lte-anr.h>
 #include <ns3/lte-chunk-processor.h>
+#include <ns3/lte-common.h>
 #include <ns3/lte-enb-component-carrier-manager.h>
 #include <ns3/lte-enb-mac.h>
 #include <ns3/lte-enb-net-device.h>

src/lte/model/lte-common.h

@@ -32,6 +32,12 @@
 namespace ns3
 {
 
+/// Minimum number of carrier components allowed by 3GPP up to R13
+constexpr uint32_t MIN_NO_CC = 1;
+
+/// Maximum number of carrier components allowed by 3GPP up to R13
+constexpr uint32_t MAX_NO_CC = 5;
+
 /// LteFlowId structure
 struct LteFlowId_t
 {

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

@@ -29,6 +29,7 @@
 #include <ns3/eps-bearer-tag.h>
 #include <ns3/fatal-error.h>
 #include <ns3/log.h>
+#include <ns3/lte-common.h>
 #include <ns3/lte-pdcp.h>
 #include <ns3/lte-radio-bearer-info.h>
 #include <ns3/lte-rlc-am.h>

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

@@ -51,9 +51,6 @@
 #include <set>
 #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
 {
 

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

@@ -20,6 +20,8 @@
 
 #include "lte-ue-component-carrier-manager.h"
 
+#include "lte-common.h"
+
 #include <ns3/log.h>
 
 namespace ns3

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

@@ -29,9 +29,6 @@
 #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
 {
 

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

@@ -27,6 +27,7 @@
 
 #include <ns3/fatal-error.h>
 #include <ns3/log.h>
+#include <ns3/lte-common.h>
 #include <ns3/lte-pdcp.h>
 #include <ns3/lte-radio-bearer-info.h>
 #include <ns3/lte-rlc-am.h>

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

@@ -41,9 +41,6 @@
 #include <set>
 #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
 {