From f5fcd5687db34bbdcc794d84d7917ce521e955d7 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Sun, 14 Mar 2021 09:28:06 +0100
Subject: [PATCH] small changes in main-ocp to reflect initialization
differences int phy_init_lte_eNB().
---
CHANGELOG.md | 0
LICENSE | 0
cmake_targets/at_commands/CMakeLists.txt | 0
cmake_targets/autotests/README.txt | 0
cmake_targets/autotests/core.py | 0
cmake_targets/autotests/log.py | 0
cmake_targets/autotests/openair.py | 0
cmake_targets/autotests/templates/index.html | 0
.../autotests/templates/testcase_report.html | 0
cmake_targets/autotests/test_case_list.xml | 0
cmake_targets/autotests/testsuite_ue_noS1.xml | 0
.../autotests/testsuite_ue_noS1_TCL.xml | 0
cmake_targets/autotests/tools/lib_autotest.py | 0
.../autotests/tools/lib_autotest_analyser.py | 0
.../autotests/tools/wdial.bandrich.conf | 0
cmake_targets/autotests/v2/actions/3276.txt | 0
.../autotests/v2/actions/alu_epc.bash | 0
.../autotests/v2/actions/alu_epc_stop.bash | 0
.../autotests/v2/actions/alu_hss.bash | 0
.../autotests/v2/actions/bandrich.txt | 0
.../autotests/v2/actions/client_tcp.bash | 0
.../autotests/v2/actions/client_udp.bash | 0
.../v2/actions/clone_repository.bash | 0
.../autotests/v2/actions/compilation.bash | 0
.../autotests/v2/actions/execution.bash | 0
.../v2/actions/execution_compile.bash | 0
cmake_targets/autotests/v2/actions/modem.py | 0
.../autotests/v2/actions/run_enb.bash | 0
.../autotests/v2/actions/server_tcp.bash | 0
.../autotests/v2/actions/server_udp.bash | 0
.../autotests/v2/actions/start_3276.bash | 0
.../autotests/v2/actions/start_3276.py | 0
.../autotests/v2/actions/start_bandrich.bash | 0
.../autotests/v2/actions/start_bandrich.py | 0
.../autotests/v2/actions/stop_3276.py | 0
.../autotests/v2/actions/stop_bandrich.py | 0
.../autotests/v2/actions/wvdial.3276.conf | 0
.../autotests/v2/actions/wvdial.bandrich.conf | 0
cmake_targets/autotests/v2/alu_test.py | 0
.../enb.band38.tm1.usrpb210.tdd.10MHz.conf | 0
.../enb.band38.tm1.usrpb210.tdd.20MHz.conf | 0
.../enb.band38.tm1.usrpb210.tdd.5MHz.conf | 0
.../enb.band7.tm1.usrpb210.fdd.10MHz.conf | 0
.../enb.band7.tm1.usrpb210.fdd.20MHz.conf | 0
.../enb.band7.tm1.usrpb210.fdd.5MHz.conf | 0
.../v2/config/rcc.band7.tm1.if4p5.10MHz.conf | 0
.../v2/config/rcc.band7.tm1.if4p5.20MHz.conf | 0
.../v2/config/rcc.band7.tm1.if4p5.5MHz.conf | 0
...ru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf | 0
...ru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf | 0
...rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf | 0
cmake_targets/autotests/v2/connection.py | 0
cmake_targets/autotests/v2/machine_list.py | 0
cmake_targets/autotests/v2/main.py | 0
cmake_targets/autotests/v2/task.py | 0
cmake_targets/autotests/v2/utils.py | 0
cmake_targets/doxygen/CMakeLists.txt | 0
cmake_targets/epc_test/CMakeLists.template | 0
cmake_targets/nas_sim_tools/CMakeLists.txt | 0
cmake_targets/phy_simulators/CMakeLists.txt | 0
.../s1c_mme_test/CMakeLists.template | 0
cmake_targets/tools/Kbuild.cmake | 0
.../tools/MODULES/CMakeParseArguments.cmake | 0
.../tools/MODULES/CMakeUserFindMySQL.cmake | 0
.../tools/MODULES/CMakeUserUseBison.cmake | 0
.../tools/MODULES/CMakeUserUseFlex.cmake | 0
.../tools/MODULES/FindFreeDiameter.cmake | 0
cmake_targets/tools/MODULES/FindGCCXML.cmake | 0
cmake_targets/tools/MODULES/FindGcrypt.cmake | 0
cmake_targets/tools/MODULES/FindGnuTLS.cmake | 0
cmake_targets/tools/MODULES/FindKbuild.cmake | 0
cmake_targets/tools/MODULES/FindLibXml2.cmake | 0
cmake_targets/tools/MODULES/FindMySQL.cmake | 0
cmake_targets/tools/MODULES/FindNettle.cmake | 0
.../tools/MODULES/FindPostgreSQL.cmake | 0
cmake_targets/tools/MODULES/FindSCTP.cmake | 0
cmake_targets/tools/MODULES/Kbuild.cmake | 0
.../tools/MODULES/cmake_useful.cmake | 0
.../tools/MODULES/kbuild_system.cmake | 0
cmake_targets/tools/MODULES/kmodule.cmake | 0
.../tools/MODULES/path_prefixes.cmake | 0
cmake_targets/tools/asn1tostruct.py | 0
.../tools/example_enb_exmimo_mme_hss.txt | 0
.../example_oaisim_enb_ue_mme_virtual.txt | 0
cmake_targets/tools/exmimo2_2arxg.lime | 0
cmake_targets/tools/exmimo2_2brxg.lime | 0
cmake_targets/tools/exmimo_stop_octave.m | 0
.../RRC.rel10/SystemInformation-r8-IEs.h.diff | 0
.../SystemInformation-NB-r13-IEs.h.diff | 0
.../RRC.rel14/SystemInformation-r8-IEs.h.diff | 0
...X2ap-CriticalityDiagnostics-IE-List.h.diff | 0
cmake_targets/tools/test_helper | 0
executables/main-ocp.c | 23 +++++++++++++++----
openair1/PHY/INIT/lte_init.c | 22 ++++++++++--------
94 files changed, 30 insertions(+), 15 deletions(-)
mode change 100644 => 100755 CHANGELOG.md
mode change 100644 => 100755 LICENSE
mode change 100644 => 100755 cmake_targets/at_commands/CMakeLists.txt
mode change 100644 => 100755 cmake_targets/autotests/README.txt
mode change 100644 => 100755 cmake_targets/autotests/core.py
mode change 100644 => 100755 cmake_targets/autotests/log.py
mode change 100644 => 100755 cmake_targets/autotests/openair.py
mode change 100644 => 100755 cmake_targets/autotests/templates/index.html
mode change 100644 => 100755 cmake_targets/autotests/templates/testcase_report.html
mode change 100644 => 100755 cmake_targets/autotests/test_case_list.xml
mode change 100644 => 100755 cmake_targets/autotests/testsuite_ue_noS1.xml
mode change 100644 => 100755 cmake_targets/autotests/testsuite_ue_noS1_TCL.xml
mode change 100644 => 100755 cmake_targets/autotests/tools/lib_autotest.py
mode change 100644 => 100755 cmake_targets/autotests/tools/lib_autotest_analyser.py
mode change 100644 => 100755 cmake_targets/autotests/tools/wdial.bandrich.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/3276.txt
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/alu_epc.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/alu_epc_stop.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/alu_hss.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/bandrich.txt
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/client_tcp.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/client_udp.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/clone_repository.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/compilation.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/execution.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/execution_compile.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/modem.py
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/run_enb.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/server_tcp.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/server_udp.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/start_3276.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/start_3276.py
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/start_bandrich.bash
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/start_bandrich.py
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/stop_3276.py
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/stop_bandrich.py
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/wvdial.3276.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/actions/wvdial.bandrich.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/alu_test.py
mode change 100644 => 100755 cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
mode change 100644 => 100755 cmake_targets/autotests/v2/connection.py
mode change 100644 => 100755 cmake_targets/autotests/v2/machine_list.py
mode change 100644 => 100755 cmake_targets/autotests/v2/main.py
mode change 100644 => 100755 cmake_targets/autotests/v2/task.py
mode change 100644 => 100755 cmake_targets/autotests/v2/utils.py
mode change 100644 => 100755 cmake_targets/doxygen/CMakeLists.txt
mode change 100644 => 100755 cmake_targets/epc_test/CMakeLists.template
mode change 100644 => 100755 cmake_targets/nas_sim_tools/CMakeLists.txt
mode change 100644 => 100755 cmake_targets/phy_simulators/CMakeLists.txt
mode change 100644 => 100755 cmake_targets/s1c_mme_test/CMakeLists.template
mode change 100644 => 100755 cmake_targets/tools/Kbuild.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/CMakeParseArguments.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/CMakeUserFindMySQL.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/CMakeUserUseBison.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/CMakeUserUseFlex.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindFreeDiameter.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindGCCXML.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindGcrypt.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindGnuTLS.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindKbuild.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindLibXml2.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindMySQL.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindNettle.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindPostgreSQL.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/FindSCTP.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/Kbuild.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/cmake_useful.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/kbuild_system.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/kmodule.cmake
mode change 100644 => 100755 cmake_targets/tools/MODULES/path_prefixes.cmake
mode change 100644 => 100755 cmake_targets/tools/asn1tostruct.py
mode change 100644 => 100755 cmake_targets/tools/example_enb_exmimo_mme_hss.txt
mode change 100644 => 100755 cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt
mode change 100644 => 100755 cmake_targets/tools/exmimo2_2arxg.lime
mode change 100644 => 100755 cmake_targets/tools/exmimo2_2brxg.lime
mode change 100644 => 100755 cmake_targets/tools/exmimo_stop_octave.m
mode change 100644 => 100755 cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
mode change 100644 => 100755 cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff
mode change 100644 => 100755 cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff
mode change 100644 => 100755 cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
mode change 100644 => 100755 cmake_targets/tools/test_helper
diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/cmake_targets/at_commands/CMakeLists.txt b/cmake_targets/at_commands/CMakeLists.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/README.txt b/cmake_targets/autotests/README.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/core.py b/cmake_targets/autotests/core.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/log.py b/cmake_targets/autotests/log.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/openair.py b/cmake_targets/autotests/openair.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/templates/index.html b/cmake_targets/autotests/templates/index.html
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/templates/testcase_report.html b/cmake_targets/autotests/templates/testcase_report.html
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/testsuite_ue_noS1.xml b/cmake_targets/autotests/testsuite_ue_noS1.xml
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/testsuite_ue_noS1_TCL.xml b/cmake_targets/autotests/testsuite_ue_noS1_TCL.xml
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/tools/lib_autotest.py b/cmake_targets/autotests/tools/lib_autotest.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/tools/lib_autotest_analyser.py b/cmake_targets/autotests/tools/lib_autotest_analyser.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/tools/wdial.bandrich.conf b/cmake_targets/autotests/tools/wdial.bandrich.conf
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/3276.txt b/cmake_targets/autotests/v2/actions/3276.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/alu_epc.bash b/cmake_targets/autotests/v2/actions/alu_epc.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/alu_epc_stop.bash b/cmake_targets/autotests/v2/actions/alu_epc_stop.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/alu_hss.bash b/cmake_targets/autotests/v2/actions/alu_hss.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/bandrich.txt b/cmake_targets/autotests/v2/actions/bandrich.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/client_tcp.bash b/cmake_targets/autotests/v2/actions/client_tcp.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/client_udp.bash b/cmake_targets/autotests/v2/actions/client_udp.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/clone_repository.bash b/cmake_targets/autotests/v2/actions/clone_repository.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/compilation.bash b/cmake_targets/autotests/v2/actions/compilation.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/execution.bash b/cmake_targets/autotests/v2/actions/execution.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/execution_compile.bash b/cmake_targets/autotests/v2/actions/execution_compile.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/modem.py b/cmake_targets/autotests/v2/actions/modem.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/run_enb.bash b/cmake_targets/autotests/v2/actions/run_enb.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/server_tcp.bash b/cmake_targets/autotests/v2/actions/server_tcp.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/server_udp.bash b/cmake_targets/autotests/v2/actions/server_udp.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/start_3276.bash b/cmake_targets/autotests/v2/actions/start_3276.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/start_3276.py b/cmake_targets/autotests/v2/actions/start_3276.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/start_bandrich.bash b/cmake_targets/autotests/v2/actions/start_bandrich.bash
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/start_bandrich.py b/cmake_targets/autotests/v2/actions/start_bandrich.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/stop_3276.py b/cmake_targets/autotests/v2/actions/stop_3276.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/stop_bandrich.py b/cmake_targets/autotests/v2/actions/stop_bandrich.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/wvdial.3276.conf b/cmake_targets/autotests/v2/actions/wvdial.3276.conf
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/actions/wvdial.bandrich.conf b/cmake_targets/autotests/v2/actions/wvdial.bandrich.conf
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/alu_test.py b/cmake_targets/autotests/v2/alu_test.py
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/connection.py b/cmake_targets/autotests/v2/connection.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/machine_list.py b/cmake_targets/autotests/v2/machine_list.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/main.py b/cmake_targets/autotests/v2/main.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/task.py b/cmake_targets/autotests/v2/task.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/autotests/v2/utils.py b/cmake_targets/autotests/v2/utils.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/doxygen/CMakeLists.txt b/cmake_targets/doxygen/CMakeLists.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/epc_test/CMakeLists.template b/cmake_targets/epc_test/CMakeLists.template
old mode 100644
new mode 100755
diff --git a/cmake_targets/nas_sim_tools/CMakeLists.txt b/cmake_targets/nas_sim_tools/CMakeLists.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/phy_simulators/CMakeLists.txt b/cmake_targets/phy_simulators/CMakeLists.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/s1c_mme_test/CMakeLists.template b/cmake_targets/s1c_mme_test/CMakeLists.template
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/Kbuild.cmake b/cmake_targets/tools/Kbuild.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/CMakeParseArguments.cmake b/cmake_targets/tools/MODULES/CMakeParseArguments.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/CMakeUserFindMySQL.cmake b/cmake_targets/tools/MODULES/CMakeUserFindMySQL.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/CMakeUserUseBison.cmake b/cmake_targets/tools/MODULES/CMakeUserUseBison.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/CMakeUserUseFlex.cmake b/cmake_targets/tools/MODULES/CMakeUserUseFlex.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindFreeDiameter.cmake b/cmake_targets/tools/MODULES/FindFreeDiameter.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindGCCXML.cmake b/cmake_targets/tools/MODULES/FindGCCXML.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindGcrypt.cmake b/cmake_targets/tools/MODULES/FindGcrypt.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindGnuTLS.cmake b/cmake_targets/tools/MODULES/FindGnuTLS.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindKbuild.cmake b/cmake_targets/tools/MODULES/FindKbuild.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindLibXml2.cmake b/cmake_targets/tools/MODULES/FindLibXml2.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindMySQL.cmake b/cmake_targets/tools/MODULES/FindMySQL.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindNettle.cmake b/cmake_targets/tools/MODULES/FindNettle.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindPostgreSQL.cmake b/cmake_targets/tools/MODULES/FindPostgreSQL.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/FindSCTP.cmake b/cmake_targets/tools/MODULES/FindSCTP.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/Kbuild.cmake b/cmake_targets/tools/MODULES/Kbuild.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/cmake_useful.cmake b/cmake_targets/tools/MODULES/cmake_useful.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/kbuild_system.cmake b/cmake_targets/tools/MODULES/kbuild_system.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/kmodule.cmake b/cmake_targets/tools/MODULES/kmodule.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/MODULES/path_prefixes.cmake b/cmake_targets/tools/MODULES/path_prefixes.cmake
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/asn1tostruct.py b/cmake_targets/tools/asn1tostruct.py
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/example_enb_exmimo_mme_hss.txt b/cmake_targets/tools/example_enb_exmimo_mme_hss.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt b/cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/exmimo2_2arxg.lime b/cmake_targets/tools/exmimo2_2arxg.lime
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/exmimo2_2brxg.lime b/cmake_targets/tools/exmimo2_2brxg.lime
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/exmimo_stop_octave.m b/cmake_targets/tools/exmimo_stop_octave.m
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff b/cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff b/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff b/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff b/cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
old mode 100644
new mode 100755
diff --git a/cmake_targets/tools/test_helper b/cmake_targets/tools/test_helper
old mode 100644
new mode 100755
diff --git a/executables/main-ocp.c b/executables/main-ocp.c
index ae1db7195bc..7a15f395f60 100644
--- a/executables/main-ocp.c
+++ b/executables/main-ocp.c
@@ -202,7 +202,6 @@ void init_eNB_afterRU(void) {
for (int inst=0; inst<RC.nb_inst; inst++) {
for (int CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
PHY_VARS_eNB *eNB = RC.eNB[inst][CC_id];
- phy_init_lte_eNB(eNB,0,0);
eNB->frame_parms.nb_antennas_rx = 0;
eNB->frame_parms.nb_antennas_tx = 0;
eNB->prach_vars.rxsigF[0] = (int16_t **)malloc16(64*sizeof(int16_t *));
@@ -228,12 +227,26 @@ void init_eNB_afterRU(void) {
for (int ce_level=0; ce_level<4; ce_level++)
eNB->prach_vars_br.rxsigF[ce_level][aa] = eNB->RU_list[ru_id]->prach_rxsigF_br[ce_level][i];
- eNB->common_vars.rxdataF[aa] = eNB->RU_list[ru_id]->common.rxdataF[i];
}
}
- AssertFatal( eNB->frame_parms.nb_antennas_rx > 0 && eNB->frame_parms.nb_antennas_rx < 4, "");
- AssertFatal( eNB->frame_parms.nb_antennas_tx > 0 && eNB->frame_parms.nb_antennas_rx < 4, "");
+
+ AssertFatal( eNB->frame_parms.nb_antennas_rx > 0 && eNB->frame_parms.nb_antennas_rx < 5, "");
+ AssertFatal( eNB->frame_parms.nb_antennas_tx > 0 && eNB->frame_parms.nb_antennas_rx < 5, "");
+
+ phy_init_lte_eNB(eNB,0,0);
+
+ // need to copy rxdataF after L1 variables are allocated
+ for (int inst=0; inst<RC.nb_inst; inst++) {
+ for (int CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
+ PHY_VARS_eNB *eNB = RC.eNB[inst][CC_id];
+ for (int ru_id=0,aa=0; ru_id<eNB->num_RU; ru_id++) {
+ for (int i=0; i<eNB->RU_list[ru_id]->nb_rx; aa++,i++)
+ eNB->common_vars.rxdataF[aa] = eNB->RU_list[ru_id]->common.rxdataF[i];
+ }
+ }
+ }
+
LOG_I(PHY,"inst %d, CC_id %d : nb_antennas_rx %d\n",inst,CC_id,eNB->frame_parms.nb_antennas_rx);
init_transport(eNB);
//init_precoding_weights(RC.eNB[inst][CC_id]);
@@ -800,7 +813,7 @@ int init_rf(RU_t *ru) {
pthread_setname_np(pthread_self(),name);
return ret;
}
-
+
void ocp_init_RU(RU_t *ru, char *rf_config_file, int send_dmrssync) {
PHY_VARS_eNB *eNB0= (PHY_VARS_eNB *)NULL;
int i;
diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c
index df5ee7c5f65..1daeb72187b 100644
--- a/openair1/PHY/INIT/lte_init.c
+++ b/openair1/PHY/INIT/lte_init.c
@@ -457,6 +457,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
}
}
+ LOG_I(PHY,"[INIT]SRS allocation\n");
// Channel estimates for SRS
for (int srs_id = 0; srs_id < NUMBER_OF_SRS_MAX; srs_id++) {
srs_vars[srs_id].srs_ch_estimates = (int32_t **) malloc16 (64 * sizeof (int32_t *));
@@ -476,6 +477,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
srs_vars[srs_id].srs = (int32_t *) malloc16_clear (2 * fp->ofdm_symbol_size * sizeof (int32_t));
}
+ LOG_I(PHY,"PRACH allocation\n");
// PRACH
prach_vars->prachF = (int16_t *) malloc16_clear (1024 * 2 * sizeof (int16_t));
// assume maximum of 64 RX antennas for PRACH receiver
@@ -506,26 +508,26 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
LOG_D(PHY,"[INIT] prach_vars->rxsigF[%d] = %p\n",i,prach_vars->rxsigF[i]);
}*/
+ printf("NUMBER_OF_ULSCH_MAX %d\n",NUMBER_OF_ULSCH_MAX);
for (int ULSCH_id=0; ULSCH_id<NUMBER_OF_ULSCH_MAX; ULSCH_id++) {
//FIXME
pusch_vars[ULSCH_id] = (LTE_eNB_PUSCH *) malloc16_clear (NUMBER_OF_ULSCH_MAX * sizeof (LTE_eNB_PUSCH));
- pusch_vars[ULSCH_id]->rxdataF_ext = (int32_t **) malloc16 (2 * sizeof (int32_t *));
- pusch_vars[ULSCH_id]->rxdataF_ext2 = (int32_t **) malloc16 (2 * sizeof (int32_t *));
- pusch_vars[ULSCH_id]->drs_ch_estimates = (int32_t **) malloc16 (2 * sizeof (int32_t *));
- pusch_vars[ULSCH_id]->drs_ch_estimates_time = (int32_t **) malloc16 (2 * sizeof (int32_t *));
- pusch_vars[ULSCH_id]->rxdataF_comp = (int32_t **) malloc16 (2 * sizeof (int32_t *));
- pusch_vars[ULSCH_id]->ul_ch_mag = (int32_t **) malloc16 (2 * sizeof (int32_t *));
- pusch_vars[ULSCH_id]->ul_ch_magb = (int32_t **) malloc16 (2 * sizeof (int32_t *));
+ pusch_vars[ULSCH_id]->rxdataF_ext = (int32_t **) malloc16 (4 * sizeof (int32_t *));
+ pusch_vars[ULSCH_id]->rxdataF_ext2 = (int32_t **) malloc16 (4 * sizeof (int32_t *));
+ pusch_vars[ULSCH_id]->drs_ch_estimates = (int32_t **) malloc16 (4 * sizeof (int32_t *));
+ pusch_vars[ULSCH_id]->drs_ch_estimates_time = (int32_t **) malloc16 (4 * sizeof (int32_t *));
+ pusch_vars[ULSCH_id]->rxdataF_comp = (int32_t **) malloc16 (4 * sizeof (int32_t *));
+ pusch_vars[ULSCH_id]->ul_ch_mag = (int32_t **) malloc16 (4 * sizeof (int32_t *));
+ pusch_vars[ULSCH_id]->ul_ch_magb = (int32_t **) malloc16 (4 * sizeof (int32_t *));
AssertFatal (fp->ofdm_symbol_size > 127, "fp->ofdm_symbol_size %d<128\n", fp->ofdm_symbol_size);
AssertFatal (fp->symbols_per_tti > 11, "fp->symbols_per_tti %d < 12\n", fp->symbols_per_tti);
AssertFatal (fp->N_RB_UL > 5, "fp->N_RB_UL %d < 6\n", fp->N_RB_UL);
-
+ AssertFatal (fp->nb_antennas_rx > 0,"fp->nb_antennas_rx = %d\n",fp->nb_antennas_rx);
for (i = 0; i < fp->nb_antennas_rx; i++) {
// FIXME We should get rid of this
pusch_vars[ULSCH_id]->rxdataF_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
-
pusch_vars[ULSCH_id]->drs_ch_estimates[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
- pusch_vars[ULSCH_id]->drs_ch_estimates_time[i] = (int32_t *)malloc16_clear( 2*sizeof(int32_t)*fp->ofdm_symbol_size );
+ pusch_vars[ULSCH_id]->drs_ch_estimates_time[i] = (int32_t *)malloc16_clear( 4*sizeof(int32_t)*fp->ofdm_symbol_size );
pusch_vars[ULSCH_id]->rxdataF_comp[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
pusch_vars[ULSCH_id]->ul_ch_mag[i] = (int32_t *)malloc16_clear( fp->symbols_per_tti*sizeof(int32_t)*fp->N_RB_UL*12 );
pusch_vars[ULSCH_id]->ul_ch_magb[i] = (int32_t *)malloc16_clear( fp->symbols_per_tti*sizeof(int32_t)*fp->N_RB_UL*12 );
--
GitLab