fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove shadowed variables for reestablishment during handover

This commit is contained in:
Francisco Paisana 2020-08-24 13:13:49 +01:00
parent 0e96ef3df0
commit b1670c005b
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srsue/hdr/stack/rrc/rrc.h
View File

@ -199,8 +199,6 @@ private:
uint32_t cell_clean_cnt = 0;
uint16_t ho_src_rnti = 0;
cell_t ho_src_cell = {};
srslte::phy_cfg_t current_phy_cfg, previous_phy_cfg = {};
srslte::mac_cfg_t current_mac_cfg, previous_mac_cfg = {};
bool current_scell_configured[SRSLTE_MAX_CARRIERS] = {};

5
srsue/hdr/stack/rrc/rrc_procedures.h
View File

@ -296,13 +296,14 @@ public:
void then(const srslte::proc_state_t& result);
static const char* name() { return "Handover"; }
cell_t ho_src_cell;
uint16_t ho_src_rnti = 0;
private:
rrc* rrc_ptr = nullptr;
// args
asn1::rrc::rrc_conn_recfg_r8_ies_s recfg_r8;
cell_t ho_src_cell;
uint16_t ho_src_rnti = 0;
// state
uint32_t target_earfcn;

6
srsue/src/stack/rrc/rrc.cc
View File

@ -674,9 +674,9 @@ void rrc::send_con_restablish_request(reest_cause_e cause, uint16_t crnti, uint1
reestablishment_successful = false;
if (cause == reest_cause_e::ho_fail) {
crnti = ho_src_rnti;
pci = ho_src_cell.get_pci();
cellid = ho_src_cell.get_cell_id();
crnti = ho_handler.get()->ho_src_rnti;
pci = ho_handler.get()->ho_src_cell.get_pci();
cellid = ho_handler.get()->ho_src_cell.get_cell_id();
} else if (cause == reest_cause_e::other_fail) {
// use source PCI after RLF
cellid = meas_cells.serving_cell().get_cell_id();

2
srsue/src/stack/rrc/rrc_procedures.cc
View File

@ -1515,7 +1515,7 @@ srslte::proc_outcome_t rrc::ho_proc::react(ra_completed_ev ev)
rrc_ptr->t304.stop();
if (ev.success) {
if (not rrc_ptr->measurements->parse_meas_config(&recfg_r8, true, rrc_ptr->ho_src_cell.get_earfcn())) {
if (not rrc_ptr->measurements->parse_meas_config(&recfg_r8, true, ho_src_cell.get_earfcn())) {
Error("Parsing measurementConfig. TODO: Send ReconfigurationReject\n");
}
}