From 66c3b7d192d307b18326bf92208d6e42b0682700 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 12 Sep 2025 19:59:28 +0200 Subject: [PATCH] Break coding_defs.h dependency on logging module coding_defs.h included defs_common.h, which pulls in many dependencies, e.g., the logging module, which pulls in T. However, it does not use anything of this. So remove, and include stdbool.h instead (because bool is used in coding_defs.h. nr_polar_defs.h relied on some includes done in coding_defs. Use includes for pthreads and SIMD to define types that are used in nr_polar_defs.h. --- openair1/PHY/CODING/3gpplte.c | 1 + openair1/PHY/CODING/coding_defs.h | 5 +---- openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c | 1 + openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openair1/PHY/CODING/3gpplte.c b/openair1/PHY/CODING/3gpplte.c index 3502a1ad56..d3aec284da 100644 --- a/openair1/PHY/CODING/3gpplte.c +++ b/openair1/PHY/CODING/3gpplte.c @@ -30,6 +30,7 @@ #include #include #include "PHY/CODING/coding_defs.h" +#include "common/utils/utils.h" //#define DEBUG_TURBO_ENCODER 1 diff --git a/openair1/PHY/CODING/coding_defs.h b/openair1/PHY/CODING/coding_defs.h index 3c91892d8c..d6e1b780f7 100644 --- a/openair1/PHY/CODING/coding_defs.h +++ b/openair1/PHY/CODING/coding_defs.h @@ -28,7 +28,7 @@ #define __CODING_DEFS__H__ #include -#include +#include #define CRC24_A 0 #define CRC24_B 1 @@ -455,8 +455,5 @@ int32_t nr_segmentation(unsigned char *input_buffer, */ int nr_get_R_ldpc_decoder(int rvidx, int E, int BG, int Z, int *llrLen, int round); -decoder_if_t phy_threegpplte_turbo_decoder; -decoder_if_t phy_threegpplte_turbo_decoder8; -decoder_if_t phy_threegpplte_turbo_decoder16; /** @} */ #endif diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c b/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c index 58764151c4..2bc3c8b517 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c +++ b/openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c @@ -20,6 +20,7 @@ */ #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h" +#include "common/utils/utils.h" // ----- Old implementation ---- const uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits) diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h index 803854c23b..519f23175c 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h @@ -38,11 +38,13 @@ #include #include #include +#include #include "PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h" #include "PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h" #include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h" #include "PHY/CODING/coding_defs.h" +#include "PHY/sse_intrin.h" // #include "SIMULATION/TOOLS/sim.h" #define NR_POLAR_DECODER_LISTSIZE 8 // uint8_t