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 ea8a56e38571e452792402c54b193598e3509b18..e0969fbc31f25845434f40ed59873bb71cd69ad9 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 370697660e62474d4410d818e47721964d83c62b..c588bc0c75257c98f366689949fdde47724833bc 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 fbbc2f1154f6cd82f8708c38749b679d7fb605e9..9addb0c830c8f2e937121a551a8cf0aceba50274 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 f49d860a51f263284140c2458536b7211dc0e2cb..a255e12680f661f962877b9a07bf5253b3f0305c 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 c119e2f1c039f7d5cf4d755dd4bee195f9735e71..517c916c859af141d46dce8e5d51fc2f1efc19e4 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 a0d3ba6d06190d5392e211a0c3c7ef2380223ec3..eb8b68b5b0e27b1ce20290ea7f4336a2d758069f 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 92a6e6f0bc49ae787a1ebbcde7077adae5a1f988..bdcc201fd9921ef88079d11e5696d9cdd03ad9e3 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 b006e04e91beb7356d5ca300d3a7ed40cfb3d7d1..0bcdba99fbef54564c5a99e0dacd1d97a3bf2764 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 cabbed871a49bd74bdc7d3a649675a44c10e207a..24a2b400e63403f4d759c1ea0035542d5e604fe7 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 a376f45453a94f2cdcbd283ed1f6b88f24d49c84..3afdb5df60cde4ded5d1666993092da50586df4f 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 d39f1e062064742373b0886fb071fb370246220d..2e13ba68a50b59426c3aab68fb73aa2492dbd38f 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 0ae17356de40bd59002d4c66af947e24ed16bc3d..70a034e6472153c8cc19c0de32f9220372d27b62 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 c58f05c82f5ca41c25adf6811d838a7c321b49b6..456d45faf24f9bc340c247c872e78e86278ac1c2 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 6f6aa987881ffb9905f68bca0d0a64a1ac0b6cb6..b842480e5d0112fa3b3c9f2745ecdc4c8653cfc0 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 ec7fce3dbf9d3f69361903df61ea688b0fd84734..98a546e8b506a24bccee70395e41f0d03dcadccc 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 4ebbff4bdab963f049e6737772cca618eae409f4..2a8506a6604373643e627b38c1af6e153f278a94 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 52c0593d1b3006072da5684d9eaf4248fc13a6d9..81fc7eedce43275998cfca24428ee77563e79452 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 d99ca88807d0fb16a714f3092aad74e9172e6129..7f920e7e384a4bc7c6e1f09b29747fb9f5031fbc 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 86c54a82f710a602d371c6377719e3237f6a248d..e5c57ffda558fc8cf8a9ec4f76c6b99a61a28e25 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 dad0ab5a2301dcef69e43366bdf150a548760195..17a33805678cc4ec66bcdf1ad6ca5cc4dce06be9 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 369b6184fd8f46460fbe26ff74a0ba2927f284d6..6721504f36608e30fb9e4f2d80b45ca475be88f4 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 14ae99c80ca81be2c5dc5df9e25009e8a03fd122..4919ad3117c86a68096c6b2b203120e2f8997a45 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 9302ac7c5828ea2cafe367336a0df1be19008919..c26a0ad698b82c59097e13338413d83e659f3694 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 0ae9e659b41f300942f7b466ba739b690038c45c..ff0d3d7a004410f06ce20ea405c02d649394aabb 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 1d22c19ec872f758658d7706f106f6a8590b0864..8195b21157e374a25de2f13d902a6e09504ef221 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 3f35175ff49af72a4fa64ab8f37d45ea42f342be..8b172a7d7368b7720a84008ef149c21007cd5632 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 0a6a8cccc69087e49bc70f8043bd7e8e91e6a3c1..0d9a243b31c43caee4640312e0847acba1830ad0 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 7ffdd063a659fa8c7be540b7dc35498de93a036c..ac8591841e98a3ea183a3c4f0e0789064e717d52 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 409fa49910153f92fbde234666dcbe5a293c95c9..93bfc2449f99d550fe3cf640a34d613fefd863a1 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 127c8654227d8e3a40b410fa7ea246bbbe440210..df9b1cbc851de6404262957778e9551875ffa453 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 64810e644ad055ce15d65a4bef420f78c0f63fa3..cac6056aa21cf0aa529669db12605b5061324743 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 db2408a145ba22adcc1f477b20d225bb38c3c083..cc99ad061e9880cba8bb9d70d50ca1b013a8d184 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 dff16ff9d77d6957d6c347991cf3543b53750cc3..dd3a5c745b10614cf69cf8a316f452524972cb69 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 60a9f76a14ff014dbbbe0dd01c072dc2a725b2e4..4ee71c13be3981d9392d4408e95a948067ef8423 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 df60ee7fa8d6a9de6a627e4c42c9ca7b6dbd624d..d619ab2958079fcfba2703c205a8710f04824d10 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 f5dce0a178e72d21bb07356666b9e27d4806ead9..558676e99b268973892a4b77a697673bd63f432e 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 d75837ff9793cc79d1aa9b0f6923818b954409a1..9a4a86341913fa3b5980de97600ec93eb8bca0f6 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 1f5aeaf777100ed1818b887615c7a07e4ee3949b..d79f5402d01633783b65250c4b14f1c50d03f200 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 60142d8fe64cfa363c141bb8b71943c1269e4c4e..f248f515b892052f1bc459bdb13390d805e36256 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 addd70ca712f7e25f01ea6dc01eb5f361557e14f..dee6c298a7b2206aaf0bd77b36e275eb9f8ace10 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 993acae34e95b894877aa7f88923d398b2d6a2c4..231581574aebb59019fb24ea9300b796a3bce26a 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 201a0c1839a10abf6cdb4e0a7c2ed9772835c736..54c12835ef38627d116207793fce88919a699c27 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 ac417c7e3a81cd7a7b11548d5d4c5b84d4c8fc82..feab0d69260abefb3f157abf78868b942afb1b91 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 3507906affeb8abd3a1d112f2029cbc987a74faa..1a0466aad33b42de5991af1b84dd6c5e74872ca3 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 a683326639c9b7fc92c1431c4b679aa1437e9073..753c2d8b5c2966fb228e0820697accc640bd47dd 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 5e750cb62652f2946d0c83116a897b91a5bd8f75..20646681d2cd25fc0666340e864b2cb9c4476776 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 4b3ac5ffad271d03d782ce1249249fe3ad9c3f1a..3449479256bb34b26024fc8a81dee9764f7ec9ba 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 497db9a306bab96faad656f7139cc904aff33243..8971633ce02743ea1603036df0320e3ddfc6c7b2 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 ae2ba73782d6161d6576cbae55545986d087aa3b..d2c1aac31eead461547248c8a1a7593330292e3e 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 f7be9e28d95f8a94535bd21cf38f3b7677f85744..7c2c2e0170999b922fab2c7e7eb2b277052dd537 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 9d71b10740cc3ba7e036835735c3b058a29a106c..723147daeb66b3cd0967a572592eef4dc9d753ee 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 ec20ac3abff08d69e88d8f35657c865867b85a8b..2e62970b3f642f936efc2f0f74bf6522b3c09136 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 5e5b191a0f206a7b9b310c4cc1fb90727871e33d..182568185e6e2543175e892e21eab7f4bb323067 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 */