diff --git a/src/lte/model/cqa-ff-mac-scheduler.h b/src/lte/model/cqa-ff-mac-scheduler.h index f3df35765..cd3ff8960 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.h +++ b/src/lte/model/cqa-ff-mac-scheduler.h @@ -35,13 +35,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element - -#define NO_SINR -5000 -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/fdbet-ff-mac-scheduler.h b/src/lte/model/fdbet-ff-mac-scheduler.h index fa658498e..2ce589843 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.h +++ b/src/lte/model/fdbet-ff-mac-scheduler.h @@ -32,13 +32,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element -#define NO_SINR -5000 - -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/fdmt-ff-mac-scheduler.h b/src/lte/model/fdmt-ff-mac-scheduler.h index a16f85390..6fa043ed5 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.h +++ b/src/lte/model/fdmt-ff-mac-scheduler.h @@ -33,17 +33,6 @@ #include #include -/** - * value for SINR outside the range defined by FF-API, used to indicate that there - * is no CQI for this element - */ -#define NO_SINR -5000 - -/// number of HARQ processes -#define HARQ_PROC_NUM 8 -/// HARQ DL timeout -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.h b/src/lte/model/fdtbfq-ff-mac-scheduler.h index 918985716..7a2a0664f 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.h +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.h @@ -32,17 +32,6 @@ #include #include -/** - * value for SINR outside the range defined by FF-API, used to indicate that there - * is no CQI for this element - */ -#define NO_SINR -5000 - -/// HARQ number of processes -#define HARQ_PROC_NUM 8 -/// HARQ DL timeout -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/ff-mac-scheduler.h b/src/lte/model/ff-mac-scheduler.h index 661e75985..635b3ef49 100644 --- a/src/lte/model/ff-mac-scheduler.h +++ b/src/lte/model/ff-mac-scheduler.h @@ -61,6 +61,16 @@ using UlHarqProcessesDciBuffer_t = std::vector; /// UL HARQ process status vector using UlHarqProcessesStatus_t = std::vector; +/// Value for SINR outside the range defined by FF-API, used to indicate that there is +/// no CQI for this element +constexpr double NO_SINR = -5000; + +/// Number of HARQ processes +constexpr uint32_t HARQ_PROC_NUM = 8; + +/// HARQ DL timeout +constexpr uint32_t HARQ_DL_TIMEOUT = 11; + /** * \ingroup ff-api * diff --git a/src/lte/model/pf-ff-mac-scheduler.h b/src/lte/model/pf-ff-mac-scheduler.h index 962108adb..679992685 100644 --- a/src/lte/model/pf-ff-mac-scheduler.h +++ b/src/lte/model/pf-ff-mac-scheduler.h @@ -31,13 +31,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element -#define NO_SINR -5000 - -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/pss-ff-mac-scheduler.h b/src/lte/model/pss-ff-mac-scheduler.h index e1aedf15f..5c52c3615 100644 --- a/src/lte/model/pss-ff-mac-scheduler.h +++ b/src/lte/model/pss-ff-mac-scheduler.h @@ -32,13 +32,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element -#define NO_SINR -5000 - -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/rr-ff-mac-scheduler.h b/src/lte/model/rr-ff-mac-scheduler.h index cdf91d285..afe70196e 100644 --- a/src/lte/model/rr-ff-mac-scheduler.h +++ b/src/lte/model/rr-ff-mac-scheduler.h @@ -31,9 +31,6 @@ #include #include -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/tdbet-ff-mac-scheduler.h b/src/lte/model/tdbet-ff-mac-scheduler.h index 04cc07f32..c3e5dd81f 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.h +++ b/src/lte/model/tdbet-ff-mac-scheduler.h @@ -32,13 +32,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element -#define NO_SINR -5000 - -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/tdmt-ff-mac-scheduler.h b/src/lte/model/tdmt-ff-mac-scheduler.h index 6ed658bb8..a3026c49d 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.h +++ b/src/lte/model/tdmt-ff-mac-scheduler.h @@ -33,13 +33,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element -#define NO_SINR -5000 - -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.h b/src/lte/model/tdtbfq-ff-mac-scheduler.h index b11b0039a..f780ead74 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.h +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.h @@ -32,13 +32,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element -#define NO_SINR -5000 - -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 { diff --git a/src/lte/model/tta-ff-mac-scheduler.h b/src/lte/model/tta-ff-mac-scheduler.h index fe996e67a..31eb6a8b8 100644 --- a/src/lte/model/tta-ff-mac-scheduler.h +++ b/src/lte/model/tta-ff-mac-scheduler.h @@ -33,13 +33,6 @@ #include #include -// value for SINR outside the range defined by FF-API, used to indicate that there -// is no CQI for this element -#define NO_SINR -5000 - -#define HARQ_PROC_NUM 8 -#define HARQ_DL_TIMEOUT 11 - namespace ns3 {