Merge remote-tracking branch 'origin/PHY_defs_common' into integration_2025_w14_p1 (!3350)

Cleanup NR PHY common definitions

openair2/GNB_APP/gnb_config.c

@@ -40,7 +40,6 @@
 #include "L1_nr_paramdef.h"
 #include "MACRLC_nr_paramdef.h"
 #include "PHY/INIT/nr_phy_init.h"
-#include "PHY/defs_common.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_common.h"
 #include "RRC/NR/nr_rrc_config.h"
@@ -71,7 +70,6 @@
 #include "ngap_messages_types.h"
 #include "nr_common.h"
 #include "oai_asn1.h"
-#include "openair1/PHY/defs_common.h"
 #include "prs_nr_paramdef.h"
 #include "radio/ETHERNET/if_defs.h"
 #include "rrc_messages_types.h"

openair2/LAYER2/NR_MAC_COMMON/nr_compute_tbs_common.c

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

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -38,8 +38,10 @@
 #include <string.h>
 #include <stdbool.h>
 #include "common/utils/nr/nr_common.h"
+#include "common/utils/LOG/log.h"
 #include "NR_CellGroupConfig.h"
 
+#define MAX_FRAME_NUMBER 0x400
 #define NR_SHORT_BSR_TABLE_SIZE 32
 #define NR_LONG_BSR_TABLE_SIZE 256
 

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

@@ -30,6 +30,7 @@
 
  */
 
+#include <math.h>
 #include "nr_mac.h"
 #include "nr_mac_common.h"
 #include "common/utils/nr/nr_common.h"

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -43,8 +43,6 @@
 #include "NR_BCCH-BCH-Message.h"
 #include "NR_ServingCellConfigCommon.h"
 #include "NR_MIB.h"
-#include "PHY/TOOLS/tools_defs.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/nr_rrc_config.h"
 #include "SCHED_NR/phy_frame_config_nr.h"
 #include "T.h"

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -53,7 +53,6 @@
 #include "NR_ServingCellConfig.h"
 #include "NR_ServingCellConfigCommon.h"
 #include "NR_TAG.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/MESSAGES/asn1_msg.h"
 #include "RRC/NR/nr_rrc_config.h"
 #include "assertions.h"

openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c

@@ -29,7 +29,6 @@
 #include "NR_PDCP-Config.h"
 #include "NR_QFI.h"
 #include "NR_SDAP-Config.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/nr_rrc_common.h"
 #include "SDAP/nr_sdap/nr_sdap_entity.h"
 #include "asn_internal.h"

openair2/M2AP/m2ap_timers.c

@@ -21,7 +21,6 @@
 
 #include "m2ap_timers.h"
 #include "assertions.h"
-#include "PHY/defs_common.h"         /* TODO: try to not include this */
 #include "m2ap_messages_types.h"
 #include "m2ap_eNB_defs.h"
 #include "m2ap_ids.h"

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
-#include "PHY/defs_common.h"
 #include "common/platform_constants.h"
 #include "common/utils/T/T.h"
 #include "executables/softmodem-common.h"

openair2/RRC/NR/nr_rrc_config.h

@@ -38,8 +38,8 @@
 #include "NR_CellGroupConfig.h"
 #include "NR_UE-NR-Capability.h"
 #include "NR_UL-CCCH-Message.h"
-#include "PHY/defs_common.h"
 #include "f1ap_messages_types.h"
+#include "common/platform_types.h"
 struct NR_MeasurementTimingConfiguration;
 struct NR_PDSCH_TimeDomainResourceAllocationList;
 

openair2/RRC/NR/rrc_gNB.c

@@ -48,7 +48,6 @@
 #include "NGAP_CauseRadioNetwork.h"
 #include "openair2/LAYER2/NR_MAC_COMMON/nr_mac.h"
 #include "OCTET_STRING.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/MESSAGES/asn1_msg.h"
 #include "RRC/NR/mac_rrc_dl.h"
 #include "RRC/NR/nr_rrc_common.h"

openair2/RRC/NR/rrc_gNB_NGAP.c

@@ -52,7 +52,6 @@
 #include "NR_UERadioAccessCapabilityInformation.h"
 #include "MAC/mac.h"
 #include "OCTET_STRING.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/MESSAGES/asn1_msg.h"
 #include "RRC/NR/nr_rrc_common.h"
 #include "RRC/NR/nr_rrc_defs.h"

openair2/RRC/NR/rrc_gNB_du.c

@@ -26,7 +26,6 @@
 #include "F1AP_CauseMisc.h"
 #include "F1AP_CauseProtocol.h"
 #include "F1AP_CauseRadioNetwork.h"
-#include "PHY/defs_common.h"
 #include "T.h"
 #include "asn_codecs.h"
 #include "assertions.h"

openair2/RRC/NR/rrc_gNB_internode.c

@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "OCTET_STRING.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/nr_rrc_proto.h"
 #include "T.h"
 #include "asn_codecs.h"

openair2/RRC/NR/rrc_gNB_nsa.c

@@ -40,7 +40,6 @@
 #include <string.h>
 #include "MESSAGES/asn1_msg.h"
 #include "OCTET_STRING.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/nr_rrc_config.h"
 #include "T.h"
 #include "asn_codecs.h"

openair2/RRC/NR/rrc_gNB_radio_bearers.c

@@ -22,7 +22,6 @@
 #include "rrc_gNB_radio_bearers.h"
 #include <stddef.h>
 #include "E1AP_RLC-Mode.h"
-#include "PHY/defs_common.h"
 #include "RRC/NR/nr_rrc_defs.h"
 #include "T.h"
 #include "asn_internal.h"

openair2/SDAP/nr_sdap/nr_sdap_entity.c

@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "PHY/defs_common.h"
 #include "T.h"
 #include "assertions.h"
 #include "common/utils/T/T.h"

openair2/X2AP/x2ap_timers.c

@@ -21,7 +21,6 @@
 
 #include "x2ap_timers.h"
 #include "assertions.h"
-#include "PHY/defs_common.h"         /* TODO: try to not include this */
 #include "x2ap_messages_types.h"
 #include "x2ap_eNB_defs.h"
 #include "x2ap_ids.h"