remove NR/nr_rrc_proto.h dependency from nr_rlc_oai_api.h

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -33,6 +33,7 @@
 /* MAC */
 #include "nr_mac_gNB.h"
 #include "NR_MAC_gNB/mac_proto.h"
+#include "openair2/COMMON/mac_messages_types.h"
 
 /* Utils */
 #include "common/utils/LOG/log.h"

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -61,6 +61,11 @@
 
 #include "common/utils/alg/find.h"
 
+// 3GPP TS 38.331 Section 12 Table 12.1-1: UE performance requirements for RRC procedures for UEs
+#define NR_RRC_SETUP_DELAY_MS           10
+#define NR_RRC_RECONFIGURATION_DELAY_MS 10
+#define NR_RRC_BWP_SWITCHING_DELAY_MS   6
+
 // #define DEBUG_DCI
 //  CQI TABLES (10 times the value in 214 to adequately compare with R)
 //  Table 1 (38.214 5.2.2.1-2)

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.h

@@ -34,7 +34,6 @@
 #include "NR_LogicalChannelIdentity.h"
 #include "NR_RadioBearerConfig.h"
 #include "NR_CellGroupConfig.h"
-#include "openair2/RRC/NR/nr_rrc_proto.h"
 #include "nr_rlc_ue_manager.h"
 
 

openair2/RRC/NR/nr_rrc_defs.h

@@ -55,11 +55,6 @@
 #include "NR_UE-NR-Capability.h"
 #include "intertask_interface.h"
 
-// 3GPP TS 38.331 Section 12 Table 12.1-1: UE performance requirements for RRC procedures for UEs
-#define NR_RRC_SETUP_DELAY_MS           10
-#define NR_RRC_RECONFIGURATION_DELAY_MS 10
-#define NR_RRC_BWP_SWITCHING_DELAY_MS   6
-
 typedef enum {
   NR_RRC_OK=0,
   NR_RRC_ConnSetup_failed,