maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes after merge

Browse Source
This commit is contained in:
Laurent
2020-08-21 15:50:27 +02:00
parent 38f01abd77
commit 038a80b2ff
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/main-ocp.c
-6
View File
@@ -1324,14 +1324,8 @@ int main ( int argc, char **argv ) {
// end of CI modifications // end of CI modifications
//getchar(); //getchar();
<<<<<<< HEAD
if(IS_SOFTMODEM_DOFORMS) {
load_softscope("enb",NULL);
}
=======
if(IS_SOFTMODEM_DOFORMS) if(IS_SOFTMODEM_DOFORMS)
load_softscope("enb", NULL); load_softscope("enb", NULL);
>>>>>>> 7f28f8d10dc0d73fd4b10d4a89fde554158f9fb5
itti_wait_tasks_end(); itti_wait_tasks_end();
oai_exit=1; oai_exit=1;
executables/ocp-gnb.c
+1
View File
@@ -46,6 +46,7 @@
#include <forms.h> #include <forms.h>
#include <executables/stats.h> #include <executables/stats.h>
#include <openair1/PHY/TOOLS/nr_phy_scope.h> #include <openair1/PHY/TOOLS/nr_phy_scope.h>
#include <openair1/PHY/TOOLS/phy_scope_interface.h>
// Global vars // Global vars
#include <openair2/LAYER2/MAC/mac_vars.h> #include <openair2/LAYER2/MAC/mac_vars.h>