Merge remote-tracking branch 'origin/develop' into develop-SRS

# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c

openair2/COMMON/openair_defs.h

@@ -24,26 +24,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#if !defined (msg)
-# define msg(aRGS...) LOG_D(PHY, ##aRGS)
-#endif
-#ifndef malloc16
-#  ifdef __AVX2__
-#    define malloc16(x) memalign(32,x)
-#  else
-#    define malloc16(x) memalign(16,x)
-#  endif
-#endif
-#define free16(y,x) free(y)
-#define bigmalloc malloc
-#define bigmalloc16 malloc16
-#define openair_free(y,x) free((y))
-#define PAGE_SIZE 4096
-
-#define PAGE_MASK 0xfffff000
-#define virt_to_phys(x) (x)
-
-#define cmax(a,b)  ((a>b) ? (a) : (b))
-#define cmin(a,b)  ((a<b) ? (a) : (b))
+#include <common/utils/utils.h>
 #endif // /*__openair_DEFS_H__ */
 

openair2/SIMULATION/NR_RRC/itti_sim.c

@@ -546,7 +546,7 @@ int main( int argc, char **argv )
 #endif
 
   logInit();
-  //configure_linux();
+  //set_latency_target();
   printf("Reading in command-line options\n");
   get_options ();
 

openair2/UTIL/LISTS/list.h

@@ -48,6 +48,8 @@
 
 
 #include "UTIL/MEM/mem_block.h"
+#include <common/utils/assertions.h>
+
 
 //-----------------------------------------------------------------------------
 void         list_init (list_t* , char *);
@@ -126,10 +128,13 @@ static inline void * dataArray(varArray_t * input) {
   return input+1;
 }
 
-static inline void appendVarArray(varArray_t * input, void* data) {
+static inline void appendVarArray(varArray_t ** inputPtr, void* data) {
+  varArray_t *input=*inputPtr;
   if (input->size>=input->mallocedSize) {
      input->mallocedSize+=input->increment;
-     input=(varArray_t *)realloc(input,sizeof(varArray_t)+input->mallocedSize*input->atomSize);
+     *inputPtr=(varArray_t *)realloc(input,sizeof(varArray_t)+input->mallocedSize*input->atomSize);
+     AssertFatal(*inputPtr, "no memory left");
+     input=*inputPtr;
   }
   memcpy((uint8_t*)(input+1)+input->atomSize*input->size++, data, input->atomSize);
 }