debugging of new directory structure, file renaming, and eNB/UE splitting. dlsim/ulsim functional.

openair1/SIMULATION/TOOLS/abstraction.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "PHY/TOOLS/defs.h"
-#include "defs.h"
+#include "SIMULATION/TOOLS/sim.h"
+#include "PHY/TOOLS/tools_defs.h"
 
 // NEW code with lookup table for sin/cos based on delay profile (TO BE TESTED)
 

openair1/SIMULATION/TOOLS/multipath_channel.c

@@ -23,8 +23,9 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "defs.h"
-#include "SIMULATION/RF/defs.h"
+#include "PHY/TOOLS/tools_defs.h"
+#include "SIMULATION/RF/rf.h"
+#include "sim.h"
 
 //#define DEBUG_CH
 uint8_t multipath_channel_nosigconv(channel_desc_t *desc)

openair1/SIMULATION/TOOLS/multipath_tv_channel.c

@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "defs.h"
-#include "SIMULATION/RF/defs.h"
+#include "sim.h"
+#include "SIMULATION/RF/rf.h"
 #include <complex.h>
 
 void tv_channel(channel_desc_t *desc,double complex ***H,uint16_t length);

openair1/SIMULATION/TOOLS/random_channel.c

@@ -26,8 +26,8 @@
 #include <string.h>
 
 
-#include "PHY/TOOLS/defs.h"
-#include "defs.h"
+#include "PHY/TOOLS/tools_defs.h"
+#include "sim.h"
 #include "scm_corrmat.h"
 #include "UTIL/LOG/log.h"
 //#define DEBUG_CH

openair1/SIMULATION/TOOLS/rangen_double.c

@@ -24,7 +24,7 @@
 #include <math.h>
 #include <time.h>
 
-#include  "defs.h"
+#include  "sim.h"
 
 static unsigned int seed, iy, ir[98];
 /*

openair1/SIMULATION/TOOLS/sim.h

@@ -21,7 +21,7 @@
 
 #ifndef __SIMULATION_TOOLS_DEFS_H__
 #define __SIMULATION_TOOLS_DEFS_H__
-#include "PHY/defs.h"
+#include "PHY/defs_common.h"
 
 /** @defgroup _numerical_ Useful Numerical Functions
  *@{