From 5a8454f5a8a0511cd3726f0e8b0eac8b86bed1d0 Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Tue, 6 Mar 2018 13:44:19 +0100 Subject: [PATCH] Fix for staying on PLMN search after disconnect --- srsue/src/phy/phch_worker.cc | 2 +- srsue/src/upper/rrc.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc index 88c9b54c8..4546788ec 100644 --- a/srsue/src/phy/phch_worker.cc +++ b/srsue/src/phy/phch_worker.cc @@ -529,7 +529,7 @@ bool phch_worker::decode_pdcch_dl(srsue::mac_interface_phy::mac_grant_t* grant) if (srslte_ue_dl_find_dl_dci_type(&ue_dl, phy->config->dedicated.antenna_info_explicit_value.tx_mode, cfi, tti%10, dl_rnti, type, &dci_msg) != 1) { if (type == SRSLTE_RNTI_RAR) { - Info("RAR not found\n"); + Info("RAR not found, SNR=%.1f dB\n", 10*log10(srslte_chest_dl_get_snr(&ue_dl.chest))); } return false; } diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc index 7c2798658..37ae14e8c 100644 --- a/srsue/src/upper/rrc.cc +++ b/srsue/src/upper/rrc.cc @@ -767,9 +767,9 @@ void rrc::earfcn_end() { rrc_log->info("Finished searching cells in EARFCN set while in state %s\n", rrc_state_text[state]); // If searching for PLMN, indicate NAS we scanned all frequencies - if (state == RRC_STATE_PLMN_SELECTION) { + if (state >= RRC_STATE_PLMN_SELECTION && state < RRC_STATE_CONNECTING) { nas->plmn_search_end(); - } else if (state == RRC_STATE_CONNECTED) { + } else if (state >= RRC_STATE_CONNECTING && state < RRC_STATE_LEAVE_CONNECTED) { leave_connected(); } }