From cd667e5563e86dfce415dd3b6780b8af43c112dd Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Mon, 13 May 2019 15:52:54 +0200
Subject: [PATCH] RRC: add an option to enable measurement reports
In the configuration file, to enable measurements, add:
enable_measurement_reports = "yes";
Note that if x2 is enabled then the option 'enable_measurement_reports'
is not taken into account and the measurements are enabled.
---
.../conf_files/enb.band13.tm1.50PRB.emtc.conf | 2 +
...d40.tm1.100PRB.FairScheduler.usrpb210.conf | 2 +
...nd40.tm1.25PRB.FairScheduler.usrpb210.conf | 2 +
...nd40.tm1.50PRB.FairScheduler.usrpb210.conf | 2 +
.../enb.band7.tm1.100PRB.usrpb210.conf | 2 +
.../enb.band7.tm1.25PRB.usrpb210.conf | 2 +
.../enb.band7.tm1.50PRB.usrpb210.conf | 2 +
.../enb.band7.tm2.25PRB.usrpb210.conf | 2 +
ci-scripts/conf_files/lte-fdd-basic-sim.conf | 2 +
ci-scripts/conf_files/lte-tdd-basic-sim.conf | 2 +
...d40.tm1.100PRB.FairScheduler.usrpb210.conf | 2 +
...nd40.tm1.25PRB.FairScheduler.usrpb210.conf | 2 +
...nd40.tm1.50PRB.FairScheduler.usrpb210.conf | 2 +
...cc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf | 2 +
...rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf | 2 +
...rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf | 2 +
.../conf_files/rcc.band7.tm1.nfapi.conf | 2 +
.../enb.band38.tm1.usrpb210.tdd.10MHz.conf | 2 +
.../enb.band38.tm1.usrpb210.tdd.20MHz.conf | 2 +
.../enb.band38.tm1.usrpb210.tdd.5MHz.conf | 2 +
.../enb.band7.tm1.usrpb210.fdd.10MHz.conf | 2 +
.../enb.band7.tm1.usrpb210.fdd.20MHz.conf | 2 +
.../enb.band7.tm1.usrpb210.fdd.5MHz.conf | 2 +
.../v2/config/rcc.band7.tm1.if4p5.10MHz.conf | 2 +
.../v2/config/rcc.band7.tm1.if4p5.20MHz.conf | 2 +
.../v2/config/rcc.band7.tm1.if4p5.5MHz.conf | 2 +
...ru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf | 2 +
...ru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf | 2 +
...rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf | 2 +
configuration/bladeRF/enb-band7-5mhz.conf | 2 +
openair2/COMMON/rrc_messages_types.h | 3 ++
openair2/ENB_APP/enb_config.c | 16 ++++++
openair2/ENB_APP/enb_paramdef.h | 6 +++
openair2/RRC/LTE/rrc_eNB.c | 54 ++++++++++---------
.../CONF/enb.centos.calisson.conf | 2 +
.../CONF/enb.centos.memphis.conf | 2 +
.../CONF/enb.centos.nord.conf | 2 +
.../CONF/enb.band13.tm1.50PRB.emtc.conf | 2 +
.../CONF/enb.band38.tm1.100PRB.usrpx310.conf | 2 +
.../CONF/enb.band38.tm1.25PRB.iris030.conf | 2 +
.../CONF/enb.band38.tm1.usrpx310.conf | 2 +
.../CONF/enb.band42.tm1.25PRB.iris030.conf | 2 +
.../CONF/enb.band7.tm1.100PRB.usrpx310.conf | 2 +
.../CONF/enb.band7.tm1.25PRB.iris030.conf | 2 +
.../enb.band7.tm1.25PRB.usrpb210.replay.conf | 2 +
.../enb.band7.tm1.50PRB.usrpb210-d2d.conf | 2 +
.../CONF/enb.band7.tm1.50PRB.usrpb210.conf | 2 +
...band7.tm1.50PRB.usrpb210_ue_expansion.conf | 2 +
.../CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf | 2 +
.../CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf | 2 +
.../CONF/rcc.band7.tm1.50PRB.nfapi.conf | 2 +
.../CONF/rcc.band7.tm1.if4p5.50PRB.conf | 2 +
.../CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf | 2 +
53 files changed, 152 insertions(+), 25 deletions(-)
diff --git a/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf b/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
index ea8a56e385..e0969fbc31 100644
--- a/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
+++ b/ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
@@ -360,6 +360,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
index 370697660e..c588bc0c75 100644
--- a/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
index fbbc2f1154..9addb0c830 100644
--- a/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
index f49d860a51..a255e12680 100644
--- a/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
index c119e2f1c0..517c916c85 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
@@ -178,6 +178,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
index a0d3ba6d06..eb8b68b5b0 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
@@ -178,6 +178,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
index 92a6e6f0bc..bdcc201fd9 100644
--- a/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
@@ -186,6 +186,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf b/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf
index b006e04e91..0bcdba99fb 100644
--- a/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/enb.band7.tm2.25PRB.usrpb210.conf
@@ -181,6 +181,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/lte-fdd-basic-sim.conf b/ci-scripts/conf_files/lte-fdd-basic-sim.conf
index cabbed871a..24a2b400e6 100644
--- a/ci-scripts/conf_files/lte-fdd-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-fdd-basic-sim.conf
@@ -178,6 +178,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/lte-tdd-basic-sim.conf b/ci-scripts/conf_files/lte-tdd-basic-sim.conf
index a376f45453..3afdb5df60 100644
--- a/ci-scripts/conf_files/lte-tdd-basic-sim.conf
+++ b/ci-scripts/conf_files/lte-tdd-basic-sim.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
index d39f1e0620..2e13ba68a5 100644
--- a/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf
@@ -144,6 +144,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
index 0ae17356de..70a034e647 100644
--- a/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf
@@ -144,6 +144,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
index c58f05c82f..456d45faf2 100644
--- a/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf
@@ -144,6 +144,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
index 6f6aa98788..b842480e5d 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
@@ -181,6 +181,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
index ec7fce3dbf..98a546e8b5 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
@@ -181,6 +181,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
index 4ebbff4bda..2a8506a660 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
@@ -181,6 +181,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
index 52c0593d1b..81fc7eedce 100644
--- a/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
+++ b/ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf
@@ -179,6 +179,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
index d99ca88807..7f920e7e38 100644
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
index 86c54a82f7..e5c57ffda5 100644
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
index dad0ab5a23..17a3380567 100644
--- a/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
index 369b6184fd..6721504f36 100644
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
index 14ae99c80c..4919ad3117 100644
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
index 9302ac7c58..c26a0ad698 100644
--- a/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
index 0ae9e659b4..ff0d3d7a00 100644
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
index 1d22c19ec8..8195b21157 100644
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
index 3f35175ff4..8b172a7d73 100644
--- a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
@@ -141,6 +141,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
index 0a6a8cccc6..0d9a243b31 100644
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
@@ -143,6 +143,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
index 7ffdd063a6..ac8591841e 100644
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
@@ -143,6 +143,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
index 409fa49910..93bfc2449f 100644
--- a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
@@ -143,6 +143,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/configuration/bladeRF/enb-band7-5mhz.conf b/configuration/bladeRF/enb-band7-5mhz.conf
index 127c865422..df9b1cbc85 100644
--- a/configuration/bladeRF/enb-band7-5mhz.conf
+++ b/configuration/bladeRF/enb-band7-5mhz.conf
@@ -181,6 +181,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 64810e644a..cac6056aa2 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -180,6 +180,9 @@ typedef struct RrcConfigurationReq_s {
uint8_t mnc_digit_length[PLMN_LIST_MAX_SIZE];
uint8_t num_plmn;
+ int enable_measurement_reports;
+ int enable_x2;
+
uint32_t rrc_inactivity_timer_thres; // for testing, maybe change later
paging_drx_t default_drx;
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index db2408a145..cc99ad061e 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -417,6 +417,22 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc, int macrlc_has_f1) {
RRC_CONFIGURATION_REQ(msg_p).mnc[l]);
}
+ /* measurement reports enabled? */
+ if (ENBParamList.paramarray[i][ENB_ENABLE_MEASUREMENT_REPORTS].strptr != NULL &&
+ *(ENBParamList.paramarray[i][ENB_ENABLE_MEASUREMENT_REPORTS].strptr) != NULL &&
+ !strcmp(*(ENBParamList.paramarray[i][ENB_ENABLE_MEASUREMENT_REPORTS].strptr), "yes"))
+ RRC_CONFIGURATION_REQ (msg_p).enable_measurement_reports = 1;
+ else
+ RRC_CONFIGURATION_REQ (msg_p).enable_measurement_reports = 0;
+
+ /* x2 enabled? */
+ if (ENBParamList.paramarray[i][ENB_ENABLE_X2].strptr != NULL &&
+ *(ENBParamList.paramarray[i][ENB_ENABLE_X2].strptr) != NULL &&
+ !strcmp(*(ENBParamList.paramarray[i][ENB_ENABLE_X2].strptr), "yes"))
+ RRC_CONFIGURATION_REQ (msg_p).enable_x2 = 1;
+ else
+ RRC_CONFIGURATION_REQ (msg_p).enable_x2 = 0;
+
// Parse optional physical parameters
config_getlist( &CCsParamList,NULL,0,enbpath);
LOG_I(RRC,"num component carriers %d \n",CCsParamList.numelt);
diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h
index dff16ff9d7..dd3a5c745b 100644
--- a/openair2/ENB_APP/enb_paramdef.h
+++ b/openair2/ENB_APP/enb_paramdef.h
@@ -204,6 +204,8 @@ typedef enum {
#define ENB_CONFIG_STRING_LOCAL_S_PORTD "local_s_portd"
#define ENB_CONFIG_STRING_REMOTE_S_PORTD "remote_s_portd"
#define ENB_CONFIG_STRING_NR_CELLID "nr_cellid"
+#define ENB_CONFIG_STRING_MEASUREMENT_REPORTS "enable_measurement_reports"
+#define ENB_CONFIG_STRING_X2 "enable_x2"
/*-----------------------------------------------------------------------------------------------------------------------------------------*/
/* cell configuration parameters */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
@@ -224,6 +226,8 @@ typedef enum {
{ENB_CONFIG_STRING_LOCAL_S_PORTD, NULL, 0, uptr:NULL, defuintval:50001, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_REMOTE_S_PORTD, NULL, 0, uptr:NULL, defuintval:50001, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_NR_CELLID, NULL, 0, u64ptr:NULL, defint64val:0, TYPE_UINT64, 0}, \
+{ENB_CONFIG_STRING_MEASUREMENT_REPORTS, NULL, 0, strptr:NULL, defstrval:NULL, TYPE_STRING, 0}, \
+{ENB_CONFIG_STRING_X2, NULL, 0, strptr:NULL, defstrval:NULL, TYPE_STRING, 0}, \
}
#define ENB_ENB_ID_IDX 0
#define ENB_CELL_TYPE_IDX 1
@@ -240,6 +244,8 @@ typedef enum {
#define ENB_LOCAL_S_PORTD_IDX 12
#define ENB_REMOTE_S_PORTD_IDX 13
#define ENB_NRCELLID_IDX 14
+#define ENB_ENABLE_MEASUREMENT_REPORTS 15
+#define ENB_ENABLE_X2 16
#define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD}
#define ENBPARAMS_CHECK { \
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 60a9f76a14..4ee71c13be 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -1460,7 +1460,7 @@ rrc_eNB_process_RRCConnectionReestablishmentComplete(
/* for no gcc warnings */
(void)dedicatedInfoNas;
LTE_C_RNTI_t *cba_RNTI = NULL;
- int x2_enabled;
+ int measurements_enabled;
uint8_t next_xid = rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id);
ue_context_pP->ue_context.Status = RRC_CONNECTED;
ue_context_pP->ue_context.ue_rrc_inactivity_timer = 1; // set rrc inactivity when UE goes into RRC_CONNECTED
@@ -1872,7 +1872,8 @@ rrc_eNB_process_RRCConnectionReestablishmentComplete(
dedicatedInfoNASList = NULL;
}
- x2_enabled = is_x2ap_enabled();
+ measurements_enabled = RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_x2 ||
+ RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_measurement_reports;
// send LTE_RRCConnectionReconfiguration
memset(buffer, 0, RRC_BUF_SIZE);
@@ -1887,9 +1888,9 @@ rrc_eNB_process_RRCConnectionReestablishmentComplete(
//#ifdef EXMIMO_IOT
// NULL, NULL, NULL,NULL,
//#else
- x2_enabled ? (LTE_MeasObjectToAddModList_t *)MeasObj_list : NULL, // MeasObj_list,
- x2_enabled ? (LTE_ReportConfigToAddModList_t *)ReportConfig_list : NULL, // ReportConfig_list,
- x2_enabled ? (LTE_QuantityConfig_t *)quantityConfig : NULL, //quantityConfig,
+ measurements_enabled ? (LTE_MeasObjectToAddModList_t *)MeasObj_list : NULL, // MeasObj_list,
+ measurements_enabled ? (LTE_ReportConfigToAddModList_t *)ReportConfig_list : NULL, // ReportConfig_list,
+ measurements_enabled ? (LTE_QuantityConfig_t *)quantityConfig : NULL, //quantityConfig,
(LTE_MeasIdToAddModList_t *)NULL,
//#endif
(LTE_MAC_MainConfig_t *)ue_context_pP->ue_context.mac_MainConfig,
@@ -2798,7 +2799,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
/* For no gcc warnings */
(void) dedicatedInfoNas;
LTE_C_RNTI_t *cba_RNTI = NULL;
- int x2_enabled;
+ int measurements_enabled;
uint8_t xid = rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id); //Transaction_id,
uint8_t cc_id = ue_context_pP->ue_context.primaryCC_id;
LTE_UE_EUTRA_Capability_t *UEcap = ue_context_pP->ue_context.UE_Capability;
@@ -3340,7 +3341,8 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
dedicatedInfoNASList = NULL;
}
- x2_enabled = is_x2ap_enabled();
+ measurements_enabled = RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_x2 ||
+ RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_measurement_reports;
memset(buffer, 0, RRC_BUF_SIZE);
@@ -3352,10 +3354,10 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
(LTE_DRB_ToReleaseList_t *) NULL, // DRB2_list,
(struct LTE_SPS_Config *) NULL, // *sps_Config,
(struct LTE_PhysicalConfigDedicated *) *physicalConfigDedicated,
- x2_enabled ? (LTE_MeasObjectToAddModList_t *) MeasObj_list : NULL,
- x2_enabled ? (LTE_ReportConfigToAddModList_t *) ReportConfig_list : NULL,
- x2_enabled ? (LTE_QuantityConfig_t *) quantityConfig : NULL,
- x2_enabled ? (LTE_MeasIdToAddModList_t *) MeasId_list : NULL,
+ measurements_enabled ? (LTE_MeasObjectToAddModList_t *) MeasObj_list : NULL,
+ measurements_enabled ? (LTE_ReportConfigToAddModList_t *) ReportConfig_list : NULL,
+ measurements_enabled ? (LTE_QuantityConfig_t *) quantityConfig : NULL,
+ measurements_enabled ? (LTE_MeasIdToAddModList_t *) MeasId_list : NULL,
(LTE_MAC_MainConfig_t *) mac_MainConfig,
(LTE_MeasGapConfig_t *) NULL,
(LTE_MobilityControlInfo_t *) NULL,
@@ -3473,7 +3475,7 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
/* for no gcc warnings */
(void)dedicatedInfoNas;
LTE_C_RNTI_t *cba_RNTI = NULL;
- int x2_enabled;
+ int measurements_enabled;
uint8_t xid = rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id); //Transaction_id,
#ifdef CBA
//struct PUSCH_CBAConfigDedicated_vlola *pusch_CBAConfigDedicated_vlola;
@@ -3843,7 +3845,8 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
dedicatedInfoNASList = NULL;
}
- x2_enabled = is_x2ap_enabled();
+ measurements_enabled = RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_x2 ||
+ RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_measurement_reports;
memset(buffer, 0, RRC_BUF_SIZE);
size = do_RRCConnectionReconfiguration(ctxt_pP,
@@ -3857,10 +3860,10 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
// #ifdef EXMIMO_IOT
// NULL, NULL, NULL,NULL,
// #else
- x2_enabled ? (LTE_MeasObjectToAddModList_t *)MeasObj_list : NULL,
- x2_enabled ? (LTE_ReportConfigToAddModList_t *)ReportConfig_list : NULL,
- x2_enabled ? (LTE_QuantityConfig_t *)quantityConfig : NULL,
- x2_enabled ? (LTE_MeasIdToAddModList_t *)MeasId_list : NULL,
+ measurements_enabled ? (LTE_MeasObjectToAddModList_t *)MeasObj_list : NULL,
+ measurements_enabled ? (LTE_ReportConfigToAddModList_t *)ReportConfig_list : NULL,
+ measurements_enabled ? (LTE_QuantityConfig_t *)quantityConfig : NULL,
+ measurements_enabled ? (LTE_MeasIdToAddModList_t *)MeasId_list : NULL,
// #endif
(LTE_MAC_MainConfig_t *)mac_MainConfig,
(LTE_MeasGapConfig_t *)NULL,
@@ -4108,7 +4111,7 @@ rrc_eNB_process_MeasurementReport(
return;
/* if X2AP is disabled, do nothing */
- if (!is_x2ap_enabled())
+ if (!RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_x2)
return;
LOG_D(RRC, "A3 event is triggered...\n");
@@ -4498,7 +4501,7 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
/* for no gcc warnings */
(void)dedicatedInfoNas;
LTE_C_RNTI_t *cba_RNTI = NULL;
- int x2_enabled;
+ int measurements_enabled;
uint8_t xid = rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id); //Transaction_id,
#ifdef CBA
//struct PUSCH_CBAConfigDedicated_vlola *pusch_CBAConfigDedicated_vlola;
@@ -5260,7 +5263,8 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
#endif
- x2_enabled = is_x2ap_enabled();
+ measurements_enabled = RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_x2 ||
+ RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_measurement_reports;
memset(buffer, 0, RRC_BUF_SIZE);
char rrc_buf[1000 /* arbitrary, should be big enough, has to be less than size of return buf by a few bits/bytes */];
@@ -5276,10 +5280,10 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
//#ifdef EXMIMO_IOT
// NULL, NULL, NULL,NULL,
//#else
- x2_enabled ? (LTE_MeasObjectToAddModList_t *)MeasObj_list : NULL,
- x2_enabled ? (LTE_ReportConfigToAddModList_t *)ReportConfig_list : NULL,
- x2_enabled ? (LTE_QuantityConfig_t *)quantityConfig : NULL,
- x2_enabled ? (LTE_MeasIdToAddModList_t *)MeasId_list : NULL,
+ measurements_enabled ? (LTE_MeasObjectToAddModList_t *)MeasObj_list : NULL,
+ measurements_enabled ? (LTE_ReportConfigToAddModList_t *)ReportConfig_list : NULL,
+ measurements_enabled ? (LTE_QuantityConfig_t *)quantityConfig : NULL,
+ measurements_enabled ? (LTE_MeasIdToAddModList_t *)MeasId_list : NULL,
//#endif
(LTE_MAC_MainConfig_t *)mac_MainConfig,
(LTE_MeasGapConfig_t *)NULL,
@@ -7458,7 +7462,7 @@ void rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id)
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX, VCD_FUNCTION_IN);
- if (is_x2ap_enabled()) {
+ if (RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_x2) {
/* send a tick to x2ap */
msg = itti_alloc_new_message(TASK_RRC_ENB, X2AP_SUBFRAME_PROCESS);
itti_send_msg_to_task(TASK_X2AP, ctxt_pP->module_id, msg);
diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
index df60ee7fa8..d619ab2958 100644
--- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
+++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
@@ -37,6 +37,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
index f5dce0a178..558676e99b 100644
--- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
+++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
@@ -49,6 +49,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
index d75837ff97..9a4a863419 100644
--- a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
+++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
@@ -36,6 +36,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
index 1f5aeaf777..d79f5402d0 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
@@ -360,6 +360,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf
index 60142d8fe6..f248f515b8 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.100PRB.usrpx310.conf
@@ -142,6 +142,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf
index addd70ca71..dee6c298a7 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.25PRB.iris030.conf
@@ -178,6 +178,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf
index 993acae34e..231581574a 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.usrpx310.conf
@@ -142,6 +142,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf
index 201a0c1839..54c12835ef 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band42.tm1.25PRB.iris030.conf
@@ -178,6 +178,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
index ac417c7e3a..feab0d6926 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
@@ -145,6 +145,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf
index 3507906aff..1a0466aad3 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.iris030.conf
@@ -178,6 +178,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf
index a683326639..753c2d8b5c 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.usrpb210.replay.conf
@@ -179,6 +179,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
index 5e750cb626..20646681d2 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
@@ -179,6 +179,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
index 4b3ac5ffad..3449479256 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
@@ -179,6 +179,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf
index 497db9a306..8971633ce0 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210_ue_expansion.conf
@@ -146,6 +146,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf
index ae2ba73782..d2c1aac31e 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band38.tm1.if4p5.50PRB.lo.conf
@@ -148,6 +148,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
index f7be9e28d9..7c2c2e0170 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
@@ -148,6 +148,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
index 9d71b10740..723147daeb 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
@@ -179,6 +179,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
index ec20ac3abf..2e62970b3f 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf
@@ -148,6 +148,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
index 5e5b191a0f..182568185e 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
@@ -147,6 +147,8 @@ eNBs =
}
);
+ enable_measurement_reports = "no";
+
///X2
enable_x2 = "no";
t_reloc_prep = 1000; /* unit: millisecond */
--
GitLab