From ba469c5282d8893ea7efe3e0369e01d72779c006 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Wed, 8 Oct 2014 13:08:02 +0000
Subject: [PATCH] Tested in virtualization, with phy
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5851 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/LAYER2/MAC/main.c | 5 ++++-
openair2/RRC/LITE/rrc_UE.c | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/openair2/LAYER2/MAC/main.c b/openair2/LAYER2/MAC/main.c
index b0851f39f3..d8304370c1 100644
--- a/openair2/LAYER2/MAC/main.c
+++ b/openair2/LAYER2/MAC/main.c
@@ -75,11 +75,14 @@ void dl_phy_sync_success(module_id_t module_idP,
unsigned char eNB_index,
uint8_t first_sync){ //init as MR
LOG_D(MAC,"[UE %d] Frame %d: PHY Sync to eNB_index %d successful \n", module_idP, frameP, eNB_index);
+#if ! defined(ENABLE_USE_MME)
if (first_sync==1) {
layer2_init_UE(module_idP);
openair_rrc_ue_init(module_idP,eNB_index);
}
- else {
+ else
+#endif
+ {
mac_in_sync_ind(module_idP,frameP,eNB_index);
}
diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c
index 4061efe8b0..64e8928301 100644
--- a/openair2/RRC/LITE/rrc_UE.c
+++ b/openair2/RRC/LITE/rrc_UE.c
@@ -2886,6 +2886,11 @@ void *rrc_ue_task(void *args_p) {
LOG_I(RRC, "[UE %d] Received %s: state %d, plmnID %d, rat %x\n", ue_mod_id, msg_name, rrc_get_state(ue_mod_id),
NAS_CELL_SELECTION_REQ (msg_p).plmnID, NAS_CELL_SELECTION_REQ (msg_p).rat);
+ if (rrc_get_state(ue_mod_id) == RRC_STATE_INACTIVE) {
+ // have a look at MAC/main.c void dl_phy_sync_success(...)
+ openair_rrc_ue_init(ue_mod_id,0);
+ }
+
/* Save cell selection criterion */
{
UE_rrc_inst[ue_mod_id].plmnID = NAS_CELL_SELECTION_REQ (msg_p).plmnID;
--
GitLab