From 727e2fef611badbdff76e64de59dd415de806c69 Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Wed, 5 Feb 2014 08:02:01 +0000
Subject: [PATCH] Adding TDD config parameters in RRC configuration message.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5029 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/COMMON/rrc_messages_types.h | 2 ++
openair2/ENB_APP/enb_app.c | 2 ++
openair2/RRC/LITE/MESSAGES/asn1_msg.c | 14 ++++++++++++--
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index ebf2668b65..78dca83387 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -68,6 +68,8 @@ typedef struct RrcConfigurationReq_s {
paging_drx_t default_drx;
lte_frame_type_t frame_type;
+ uint8_t tdd_config;
+ uint8_t tdd_config_s;
int16_t eutra_band;
} RrcConfigurationReq;
diff --git a/openair2/ENB_APP/enb_app.c b/openair2/ENB_APP/enb_app.c
index 20706f5b70..096b2299e8 100644
--- a/openair2/ENB_APP/enb_app.c
+++ b/openair2/ENB_APP/enb_app.c
@@ -86,6 +86,8 @@ static void configure_rrc(uint32_t enb_id, const Enb_properties_array_t *enb_pro
RRC_CONFIGURATION_REQ (msg_p).mnc = enb_properties->properties[enb_id]->mnc;
RRC_CONFIGURATION_REQ (msg_p).default_drx = enb_properties->properties[enb_id]->default_drx;
RRC_CONFIGURATION_REQ (msg_p).frame_type = enb_properties->properties[enb_id]->frame_type;
+ RRC_CONFIGURATION_REQ (msg_p).tdd_config = enb_properties->properties[enb_id]->tdd_config;
+ RRC_CONFIGURATION_REQ (msg_p).tdd_config_s = enb_properties->properties[enb_id]->tdd_config_s;
RRC_CONFIGURATION_REQ (msg_p).eutra_band = enb_properties->properties[enb_id]->eutra_band;
itti_send_msg_to_task (TASK_RRC_ENB, enb_id, msg_p);
diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg.c b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
index aa842400fb..d5cc8b31ae 100644
--- a/openair2/RRC/LITE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
@@ -525,9 +525,19 @@ uint8_t do_SIB1(uint8_t Mod_id, LTE_DL_FRAME_PARMS *frame_parms, uint8_t *buffer
{
(*sib1)->tdd_Config = CALLOC(1,sizeof(struct TDD_Config));
- (*sib1)->tdd_Config->subframeAssignment = frame_parms->tdd_config;
+ (*sib1)->tdd_Config->subframeAssignment =
+#if defined(ENABLE_ITTI)
+ configuration->tdd_config;
+#else
+ frame_parms->tdd_config;
+#endif
- (*sib1)->tdd_Config->specialSubframePatterns = frame_parms->tdd_config_S;
+ (*sib1)->tdd_Config->specialSubframePatterns =
+#if defined(ENABLE_ITTI)
+ configuration->tdd_config_s;
+#else
+ frame_parms->tdd_config_S;
+#endif
}
(*sib1)->si_WindowLength=SystemInformationBlockType1__si_WindowLength_ms20;
--
GitLab