From 966a3a72640592a21fb71b068d1fa17cb2761953 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 2 Dec 2024 17:19:27 +0100
Subject: [PATCH] Move UE RRC msg defs to rrc_messages_types.h
---
openair2/COMMON/as_message.h | 14 --------------
openair2/COMMON/rrc_messages_types.h | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/openair2/COMMON/as_message.h b/openair2/COMMON/as_message.h
index af927f6dab9..cdf6792151b 100644
--- a/openair2/COMMON/as_message.h
+++ b/openair2/COMMON/as_message.h
@@ -581,20 +581,6 @@ typedef struct as_message_s {
} __attribute__((__packed__)) msg;
} as_message_t;
-typedef struct {
- NR_ReestablishmentCause_t cause;
-} nr_mac_rrc_config_reset_t;
-typedef struct {
- NR_CellGroupConfig_t* cellGroupConfig;
- NR_UE_NR_Capability_t* UE_NR_Capability;
-} nr_mac_rrc_config_cg_t;
-typedef struct {
- NR_BCCH_BCH_Message_t* bcch;
- int get_sib;
-} nr_mac_rrc_config_mib_t;
-typedef struct {
- NR_SIB1_t* sib1;
-} nr_mac_rrc_config_sib1_t;
/****************************************************************************/
/******************** G L O B A L V A R I A B L E S ********************/
/****************************************************************************/
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 3c1c7102609..6343cd998fb 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -462,4 +462,20 @@ typedef struct {
int ue_id;
} RlcMaxRtxIndication;
+#include "openair2/RRC/NR_UE/rrc_defs.h"
+typedef struct {
+ NR_ReestablishmentCause_t cause;
+} nr_mac_rrc_config_reset_t;
+typedef struct {
+ NR_CellGroupConfig_t *cellGroupConfig;
+ NR_UE_NR_Capability_t *UE_NR_Capability;
+} nr_mac_rrc_config_cg_t;
+typedef struct {
+ NR_BCCH_BCH_Message_t *bcch;
+ int get_sib;
+} nr_mac_rrc_config_mib_t;
+typedef struct {
+ NR_SIB1_t *sib1;
+} nr_mac_rrc_config_sib1_t;
+
#endif /* RRC_MESSAGES_TYPES_H_ */
--
GitLab