Merge remote-tracking branch 'origin/nr_include_cleanup' into integration_2024_w32

common/utils/nr/nr_common.h

@@ -38,6 +38,7 @@
 #include "assertions.h"
 #include "PHY/defs_common.h"
 
+#define NR_MAX_PDSCH_TBS 3824
 #define MAX_BWP_SIZE 275
 #define NR_MAX_NUM_BWP 4
 #define NR_MAX_HARQ_PROCESSES 16

openair1/PHY/defs_nr_common.h

@@ -81,8 +81,6 @@
 
 #define NR_MAX_NB_PORTS 32
 
-#define NR_MAX_PDSCH_TBS 3824
-
 #define MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER 36
 
 #define MAX_NUM_NR_ULSCH_SEGMENTS_PER_LAYER 34

openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c

@@ -26,7 +26,6 @@
 #define INDEX_MAX_TBS_TABLE (93)
 
 #include "common/utils/nr/nr_common.h"
-#include "openair1/PHY/defs_nr_common.h"
 #include <math.h>
 
 //Table 5.1.2.2-2

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

@@ -32,7 +32,6 @@
 
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "common/utils/nr/nr_common.h"
-#include "openair1/PHY/defs_nr_common.h"
 #include <limits.h>
 #include <executables/softmodem-common.h>
 

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -50,7 +50,6 @@
 
 /* PHY */
 #include "executables/softmodem-common.h"
-#include "openair1/PHY/defs_nr_UE.h"
 
 /* utils */
 #include "assertions.h"

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -35,9 +35,6 @@
 /* exe */
 #include <common/utils/nr/nr_common.h>
 
-/* PHY */
-#include "openair1/PHY/impl_defs_top.h"
-
 /* MAC */
 #include "NR_MAC_COMMON/nr_mac.h"
 #include "NR_MAC_COMMON/nr_mac_common.h"

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -43,11 +43,10 @@
 
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "SCHED_NR/phy_frame_config_nr.h"
-#include "openair1/PHY/defs_gNB.h"
 
 #include "NR_MIB.h"
 #include "LAYER2/NR_MAC_COMMON/nr_mac_common.h"
-#include "../../../../nfapi/oai_integration/vendor_ext.h"
+#include "nfapi/oai_integration/vendor_ext.h"
 /* Softmodem params */
 #include "executables/softmodem-common.h"
 #include <complex.h>

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c

@@ -38,8 +38,6 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
 #include "common/utils/nr/nr_common.h"
-#include "openair1/PHY/defs_nr_common.h"
-
 
 #define ENABLE_MAC_PAYLOAD_DEBUG
 
@@ -100,7 +98,7 @@ static void fill_ssb_vrb_map(NR_COMMON_channels_t *cc, int rbStart, int ssb_subc
   uint16_t *vrb_map = cc[CC_id].vrb_map;
   const int extra_prb = ssb_subcarrier_offset > 0;
   for (int rb = 0; rb < 20 + extra_prb; rb++)
-    vrb_map[rbStart + rb] = SL_to_bitmap(symStart % NR_SYMBOLS_PER_SLOT, 4);
+    vrb_map[rbStart + rb] = SL_to_bitmap(symStart % NR_NUMBER_OF_SYMBOLS_PER_SLOT, 4);
 }
 
 static int encode_mib(NR_BCCH_BCH_Message_t *mib, frame_t frame, uint8_t *buffer, int buf_size)

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -30,7 +30,6 @@
 * \warning
 */
 
-#include "openair1/SCHED_NR/fapi_nr_l1.h"
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
@@ -42,7 +41,6 @@
 #include "openair2/NR_PHY_INTERFACE/nr_sched_response.h"
 
 #define MAX_IF_MODULES 100
-//#define UL_HARQ_PRINT
 
 static NR_IF_Module_t *nr_if_inst[MAX_IF_MODULES];
 extern int oai_nfapi_harq_indication(nfapi_harq_indication_t *harq_ind);