diff --git a/common/platform_types.h b/common/platform_types.h index 9404f987ac..e2ffb7b304 100644 --- a/common/platform_types.h +++ b/common/platform_types.h @@ -33,6 +33,39 @@ #include #include +#define ALIGNARRAYSIZE(a, b) (((a + b - 1) / b) * b) +#define ALNARS_16_4(a) ALIGNARRAYSIZE(a, 4) + +typedef struct complexd { + double r; + double i; +} cd_t; + +typedef struct complexf { + float r; + float i; +} cf_t; + +typedef struct complex8 { + int8_t r; + int8_t i; +} c8_t; + +typedef struct complex16 { + int16_t r; + int16_t i; +} c16_t; + +typedef struct complex32 { + int32_t r; + int32_t i; +} c32_t; + +typedef struct complex64 { + int64_t r; + int64_t i; +} c64_t; + //----------------------------------------------------------------------------- // GENERIC ACCESS STRATUM TYPES //----------------------------------------------------------------------------- diff --git a/openair1/PHY/TOOLS/tools_defs.h b/openair1/PHY/TOOLS/tools_defs.h index 9ee558c72b..092beebcd7 100644 --- a/openair1/PHY/TOOLS/tools_defs.h +++ b/openair1/PHY/TOOLS/tools_defs.h @@ -32,7 +32,7 @@ #include #include #include - +#include "common/platform_types.h" #include "PHY/sse_intrin.h" #include "common/utils/assertions.h" @@ -51,39 +51,6 @@ extern "C" { #endif -#define ALIGNARRAYSIZE(a, b) (((a + b - 1) / b) * b) -#define ALNARS_16_4(a) ALIGNARRAYSIZE(a, 4) - - typedef struct complexd { - double r; - double i; - } cd_t; - - typedef struct complexf { - float r; - float i; - } cf_t; - - typedef struct complex8 { - int8_t r; - int8_t i; - } c8_t; - - typedef struct complex16 { - int16_t r; - int16_t i; - } c16_t; - - typedef struct complex32 { - int32_t r; - int32_t i; - } c32_t; - - typedef struct complex64 { - int64_t r; - int64_t i; - } c64_t; - typedef struct { int dim1; int dim2;