Commit a0ba68d5 authored by winckel's avatar winckel

Added some parameters in RRC configuration message:

- Default PCCH DRX cycle.
- FDD/TDD mode.
Blocked TDD config field in SIB1 when in FDD mode.
Removed some obsolete cellular functions.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5007 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 0c6b2b32
......@@ -10,6 +10,7 @@
#include "as_message.h"
#include "rrc_types.h"
#include "s1ap_messages_types.h"
//-------------------------------------------------------------------------------------------//
// Messages for RRC logging
......@@ -57,12 +58,16 @@ typedef struct RrcStateInd_s{
// eNB: ENB_APP -> RRC messages
typedef struct RrcConfigurationReq_s {
uint32_t cell_identity;
uint32_t cell_identity;
uint16_t tac;
uint16_t tac;
uint16_t mcc;
uint16_t mnc;
uint16_t mcc;
uint16_t mnc;
paging_drx_t default_drx;
lte_frame_type_t frame_type;
} RrcConfigurationReq;
// UE: NAS -> RRC messages
......
......@@ -89,6 +89,8 @@ static void configure_rrc(uint32_t enb_id)
RRC_CONFIGURATION_REQ (msg_p).tac = enb_properties[enb_id]->tac;
RRC_CONFIGURATION_REQ (msg_p).mcc = enb_properties[enb_id]->mcc;
RRC_CONFIGURATION_REQ (msg_p).mnc = enb_properties[enb_id]->mnc;
RRC_CONFIGURATION_REQ (msg_p).default_drx = enb_properties[enb_id]->default_drx;
RRC_CONFIGURATION_REQ (msg_p).frame_type = enb_properties[enb_id]->frame_type;
itti_send_msg_to_task (TASK_RRC_ENB, enb_id, msg_p);
}
......
This diff is collapsed.
......@@ -104,6 +104,9 @@ uint8_t do_SIB23(uint8_t Mod_id,
SystemInformationBlockType13_r9_t **sib13,
uint8_t MBMS_flag
#endif
#if defined(ENABLE_ITTI)
, RrcConfigurationReq *configuration
#endif
);
/**
......
......@@ -218,13 +218,20 @@ static void init_SI (u8 Mod_id
,
&eNB_rrc_inst[Mod_id].sib13,
eNB_rrc_inst[Mod_id].MBMS_flag
#endif
#if defined(ENABLE_ITTI)
, configuration
#endif
);
/*
eNB_rrc_inst[Mod_id].sizeof_SIB23 = do_SIB2_AT4(Mod_id,
eNB_rrc_inst[Mod_id].SIB23,
&eNB_rrc_inst[Mod_id].systemInformation,
&eNB_rrc_inst[Mod_id].sib2);
&eNB_rrc_inst[Mod_id].sib2,
#if defined(ENABLE_ITTI)
, configuration
#endif
);
*/
if (eNB_rrc_inst[Mod_id].sizeof_SIB23 == 255)
mac_xface->macphy_exit ("[RRC][init_SI] FATAL, eNB_rrc_inst[Mod_id].sizeof_SIB23 == 255");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment