PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix cell meas sorting issue

This commit is contained in:
Francisco Paisana 2020-07-02 19:27:12 +01:00
parent d2dd30c8cb
commit 928459408e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,9 +138,8 @@ public:
const static int MAX_NEIGHBOUR_CELLS = 8;
typedef std::unique_ptr<cell_t> unique_cell_t;
bool add_neighbour_cell_unsorted(const rrc_interface_phy_lte::phy_meas_t& meas);
bool add_neighbour_cell(const rrc_interface_phy_lte::phy_meas_t& meas);
bool add_neighbour_cell(unique_cell_t cell);
bool add_neighbour_cell_unsorted(unique_cell_t cell);
void rem_last_neighbour();
unique_cell_t remove_neighbour_cell(uint32_t earfcn, uint32_t pci);
void clean_neighbours();
@ -162,6 +161,8 @@ public:
iterator end() { return neighbour_cells.end(); }
private:
bool add_neighbour_cell_unsorted(unique_cell_t cell);
srslte::log_ref log_h{"RRC"};
unique_cell_t serving_cell;

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

@ -385,7 +385,7 @@ void rrc::process_new_cell_meas(const std::vector<phy_meas_t>& meas)
c->set_cfo(m.cfo_hz);
} else {
// or just set initial value
neighbour_added |= neighbour_cells.add_neighbour_cell_unsorted(m);
neighbour_added |= neighbour_cells.add_neighbour_cell(m);
}
if (m.earfcn == 0) {

4
srsue/src/stack/rrc/rrc_cell.cc
View File

@ -167,7 +167,7 @@ const cell_t* cell_list::get_neighbour_cell_handle(uint32_t earfcn, uint32_t pci
}
// If only neighbour PCI is provided, copy full cell from serving cell
bool cell_list::add_neighbour_cell_unsorted(const rrc_interface_phy_lte::phy_meas_t& meas)
bool cell_list::add_neighbour_cell(const rrc_interface_phy_lte::phy_meas_t& meas)
{
phy_interface_rrc_lte::phy_cell_t phy_cell = {};
phy_cell.earfcn = meas.earfcn;
@ -176,7 +176,7 @@ bool cell_list::add_neighbour_cell_unsorted(const rrc_interface_phy_lte::phy_mea
c.get()->set_rsrp(meas.rsrp);
c.get()->set_rsrq(meas.rsrq);
c.get()->set_cfo(meas.cfo_hz);
return add_neighbour_cell_unsorted(std::move(c));
return add_neighbour_cell(std::move(c));
}
bool cell_list::add_neighbour_cell(unique_cell_t new_cell)