Skip to content

O
OpenXG-RAN
Commit 038a80b2 authored by Laurent's avatar Laurent
Browse files
Options

fixes after merge

parent 38f01abd
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
executables/main-ocp.c
View file @ 038a80b2
...@@ -1324,14 +1324,8 @@ int main ( int argc, char **argv ) { ...@@ -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
View file @ 038a80b2
...@@ -46,6 +46,7 @@ ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment