code review comments + re-test

openair1/PHY/TOOLS/calibration_test.c

@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
   get_common_options(SOFTMODEM_GNB_BIT );
   config_process_cmdline( cmdline_params,sizeof(cmdline_params)/sizeof(paramdef_t),NULL);
   CONFIG_CLEARRTFLAG(CONFIG_NOEXITONHELP);
-  configure_linux();
+  set_latency_target();
 
     
   int N_RB=50;

openair1/PHY/impl_defs_top.h

@@ -107,11 +107,10 @@
  * @}
  */
 
+#include <common/utils/utils.h>
 #include "defs_eNB.h"
 #include "types.h"
 
-
-
 /** @addtogroup _PHY_STRUCTURES_
  * @{
 */
@@ -315,50 +314,6 @@ typedef struct {
 #include "openairinterface5g_limits.h"
 #include "assertions.h"
 
-#define cmax(a,b)  ((a>b) ? (a) : (b))
-#define cmax3(a,b,c) ((cmax(a,b)>c) ? (cmax(a,b)) : (c))
-#define cmin(a,b)  ((a<b) ? (a) : (b))
-
-#ifdef __cplusplus
-#ifdef min
-#undef min
-#undef max
-#endif
-#else
-#define max(a,b) cmax(a,b)
-#define min(a,b) cmin(a,b)
-#endif
-
-#ifndef malloc16
-#  ifdef __AVX2__
-#    define malloc16(x) memalign(32,x+32)
-#  else
-#    define malloc16(x) memalign(16,x+16)
-#  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 free_and_zero(PtR) do { \
-      if (PtR) {           \
-        free(PtR);         \
-        PtR = NULL;        \
-      }                    \
-    } while (0)
-static inline void* malloc16_clear( size_t size )
-{
-#ifdef __AVX2__
-  void* ptr = memalign(32, size+32);
-#else
-  void* ptr = memalign(16, size+16);
-#endif
-  DevAssert(ptr);
-  memset( ptr, 0, size );
-  return ptr;
-}
-
 #endif //__PHY_IMPLEMENTATION_DEFS_H__ 
 /**@} 
 */