do not include LTE defs_common into 5G code

common/platform_types.h

@@ -69,6 +69,11 @@ typedef bool sl_discovery_flag_t;
 #define SL_DISCOVERY_FLAG_NO false
 #define SL_DISCOVERY_FLAG_YES true
 
+typedef enum {
+  TDD = 1,
+  FDD = 0
+} frame_type_t;
+
 typedef enum link_direction_e { UNKNOWN_DIR = 0, DIR_UPLINK = 1, DIR_DOWNLINK = 2 } link_direction_t;
 
 typedef enum rb_type_e { UNKNOWN_RADIO_BEARER = 0, SIGNALLING_RADIO_BEARER = 1, RADIO_ACCESS_BEARER = 2 } rb_type_t;

common/utils/nr/nr_common.c

@@ -33,6 +33,8 @@
 #include <stdint.h>
 #include "assertions.h"
 #include "common/utils/assertions.h"
+#include "common/utils/LOG/log.h"
+#include "openair1/PHY/TOOLS/tools_defs.h"
 #include "nr_common.h"
 #include <complex.h>
 

common/utils/nr/nr_common.h

@@ -36,7 +36,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include "assertions.h"
-#include "PHY/defs_common.h"
+#include "PHY/sse_intrin.h"
+#include "common/utils/utils.h"
 
 #define NR_MAX_PDSCH_TBS 3824
 #define MAX_NUM_BEAM_PERIODS 4

executables/nr-softmodem.c

@@ -51,7 +51,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
 #include "PHY/INIT/nr_phy_init.h"
 #include "PHY/TOOLS/phy_scope_interface.h"
-#include "PHY/defs_common.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_common.h"
 #include "PHY/phy_vars.h"

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nr_rate_matching.c

@@ -19,10 +19,9 @@
  *      contact@openairinterface.org
  */
 
-#include "PHY/defs_common.h"
 #include "PHY/sse_intrin.h"
-
 #include "nr_rate_matching.h"
+#include "common/utils/LOG/log.h"
 
 // #define RM_DEBUG 1
 

openair1/PHY/defs_common.h

@@ -100,8 +100,6 @@
 
 #define TC_NSEC_x32768 16667
 
-typedef enum {TDD=1,FDD=0} frame_type_t;
-
 typedef enum {EXTENDED=1,NORMAL=0} lte_prefix_type_t;
 
 typedef enum {LOCALIZED=0,DISTRIBUTED=1} vrb_t;

openair1/PHY/defs_gNB.h

@@ -39,12 +39,10 @@
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "PHY/NR_TRANSPORT/nr_transport_common_proto.h"
 #include "PHY/impl_defs_top.h"
-#include "PHY/defs_common.h"
 #include "PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface.h"
 #include "PHY/CODING/nrLDPC_extern.h"
 #include "PHY/CODING/nrLDPC_decoder/nrLDPC_types.h"
 #include "nfapi_nr_interface_scf.h"
-#include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
 
 #define MAX_NUM_RU_PER_gNB 8
 #define MAX_PUCCH0_NID 8

openair1/PHY/defs_nr_common.h

@@ -34,7 +34,6 @@
 #define __PHY_DEFS_NR_COMMON__H__
 
 #include "PHY/impl_defs_top.h"
-#include "defs_common.h"
 #include "nfapi_nr_interface_scf.h"
 #include "impl_defs_nr.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"

openair1/SIMULATION/LTE_PHY/common_sim.h

@@ -1,3 +1,4 @@
+#include "PHY/defs_common.h"
 
 double median(varArray_t *input) {
   return *(double *)((uint8_t *)(input+1)+(input->size/2)*input->atomSize);

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -56,7 +56,6 @@
 #include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
 #include "PHY/TOOLS/tools_defs.h"
 #include "PHY/defs_RU.h"
-#include "PHY/defs_common.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/defs_nr_common.h"

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -42,7 +42,6 @@
 #include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
 #include "PHY/TOOLS/tools_defs.h"
 #include "PHY/defs_RU.h"
-#include "PHY/defs_common.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/defs_nr_common.h"

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -56,7 +56,6 @@
 #include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
 #include "PHY/TOOLS/tools_defs.h"
 #include "PHY/defs_RU.h"
-#include "PHY/defs_common.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/defs_nr_common.h"

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_gNB/config.c

@@ -44,7 +44,6 @@
 #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"

openair3/M3AP/m3ap_timers.c

@@ -21,7 +21,6 @@
 
 #include "m3ap_timers.h"
 #include "assertions.h"
-#include "PHY/defs_common.h"         /* TODO: try to not include this */
 #include "m3ap_messages_types.h"
 #include "m3ap_MCE_defs.h"
 #include "m3ap_ids.h"

openair3/NGAP/ngap_gNB.c

@@ -37,7 +37,6 @@
 #include "BIT_STRING.h"
 #include "ngap_msg_includes.h"
 #include "OCTET_STRING.h"
-#include "PHY/defs_common.h"
 #include "T.h"
 #include "asn_internal.h"
 #include "assertions.h"

openair3/NGAP/ngap_gNB_handlers.c

@@ -35,7 +35,6 @@
 #include "INTEGER.h"
 #include "ngap_msg_includes.h"
 #include "OCTET_STRING.h"
-#include "PHY/defs_common.h"
 #include "T.h"
 #include "assertions.h"
 #include "common/utils/T/T.h"

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -39,7 +39,6 @@
 #include "INTEGER.h"
 #include "ngap_msg_includes.h"
 #include "OCTET_STRING.h"
-#include "PHY/defs_common.h"
 #include "T.h"
 #include "aper_encoder.h"
 #include "asn_application.h"

openair3/NGAP/ngap_gNB_ue_context.c

@@ -30,7 +30,6 @@
 #include "ngap_gNB_ue_context.h"
 #include <stdint.h>
 #include <stdio.h>
-#include "PHY/defs_common.h"
 #include "T.h"
 #include "common/utils/T/T.h"
 #include "ngap_common.h"