Merge remote-tracking branch 'origin/bugfix-227-ue-ip-setting' into develop_integration_w12

This commit is contained in:
Cedric Roux
2017-03-24 17:08:08 +01:00
7 changed files with 248 additions and 1 deletions
+4
View File
@@ -74,6 +74,8 @@ unsigned short config_frames[4] = {2,9,11,13};
#include "create_tasks.h"
#endif
#include "system.h"
#ifdef XFORMS
#include "PHY/TOOLS/lte_phy_scope.h"
#include "stats.h"
@@ -1371,6 +1373,8 @@ int main( int argc, char **argv ) {
int ret;
#endif
start_background_system();
#ifdef DEBUG_CONSOLE
setvbuf(stdout, NULL, _IONBF, 0);
setvbuf(stderr, NULL, _IONBF, 0);
+3
View File
@@ -59,6 +59,7 @@
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "system.h"
#include "PHY/TOOLS/lte_phy_scope.h"
@@ -1194,6 +1195,8 @@ main (int argc, char **argv)
clock_t t;
start_background_system();
#ifdef SMBV
// Rohde&Schwarz SMBV100A vector signal generator
strcpy(smbv_ip,DEFAULT_SMBV_IP);