Commit 1c086a18 authored by wetterwa's avatar wetterwa

Update to support 2 mobiles. Requires an update in RLC and PDCP.


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4167 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 81fff5d6
......@@ -13,7 +13,7 @@
/* ***Debug flags*** */
#define DEBUG_RRC_STATE
#define DEBUG_RRC_DETAILS
//#define DEBUG_RRC_DETAILS
//#define DEBUG_RRC_DETAILS_2
#define RRC_DEBUG_DUMMIES
......@@ -38,6 +38,10 @@
// #define DEBUG_RRC_FORWARD_MT_MEASURE_REPORT
// #endif
/* **** */
/* ** FLAG DEFINED FOR HANDLING of 2UEs in EMULATION MODE ** */
/* **** */
#define RRC_OAI_EMU
/* **** */
/* ** FLAG DEFINED FOR HANDLING of ENb Measures ** */
/* **** */
......@@ -197,6 +201,9 @@
#define RRC_SRB_OFFSET 0
#endif
//MW 19/9/2013 - Hard coded value of DRB_ID for rrc_ue_outputs.c
#define RRC_OAI_DRB0_ID 3
#define RRC_LTE_DCCH_ID 2+RRC_SRB_OFFSET // for openair scheduling
#define RRC_LCHAN_SRB0_ID 4+RRC_SRB_OFFSET // traffic on CCCH
#define RRC_LCHAN_SRB1_ID 5+RRC_SRB_OFFSET // any traffic on DCCH using RLC-UM
......
......@@ -45,9 +45,9 @@ struct rrc_srb_drb_asn1{
struct SRB_ToAddMod *SRB2_config;
struct DRB_ToAddMod *DRB1_config;
struct DRB_ToAddMod *DRB2_config;*/
int SRB2_active;
int DRB1_active;
int DRB2_active;
int SRB2_active[NUMBER_OF_UE_MAX];
int DRB1_active[NUMBER_OF_UE_MAX];
int DRB2_active[NUMBER_OF_UE_MAX];
SRB_ToAddModList_t *SRB_configList[NUMBER_OF_UE_MAX];
DRB_ToAddModList_t *DRB_configList[NUMBER_OF_UE_MAX];
......
......@@ -29,8 +29,9 @@
******************************************************************************/
struct rrc_rg_entity {
//-----------------------------------------------------------------------------
u8 protocol_state[maxUsers];
int current_SFN;
u8 protocol_state[maxUsers];
// Table to be changed into a list??
struct Mobile_Node Mobile_List[maxUsers];
u8 establishment_cause; // For NAS - A Revoir
......@@ -67,6 +68,7 @@ struct rrc_rg_entity {
// Control block for srb-drb asn1-compliant
struct rrc_srb_drb_asn1 rg_rb_asn1;
int mod_id;
int ccch_current_UE_Id; //incremented each time a new UE sends ConnReq through CCH
/* ** OAI compatible part - end **/
// Control block for Broadcast
......@@ -85,7 +87,6 @@ struct rrc_rg_entity {
// RG measures
struct rrc_rg_meas_blocks rg_meas_blocks;
int current_SFN;
// Control block for MBMS
struct rrc_rg_mbms_variables mbms;
......
......@@ -28,8 +28,6 @@ RRM_VARS *rrm_config;
rrc_rg_mbms_variables * volatile p_rg_mbms; /** pointer reference to protocol_bs->rrc.mbms */
int rrc_release_all_ressources;
int rrc_ethernet_id;
#endif
......@@ -31,5 +31,6 @@ RRM_VARS *rrm_config;
int rrc_release_all_ressources;
int rrc_ue_mobileId;
int rrc_ethernet_id;
#endif
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