Merge branch 'next' into rlc_fixes

This commit is contained in:
Andre Puschmann 2018-02-16 21:29:28 +01:00
commit 75a546cff1
2 changed files with 3 additions and 3 deletions

View File

@ -53,7 +53,7 @@ public:
bool init(srslte::radio_multi *radio_handler,
mac_interface_phy *mac,
rrc_interface_phy *rrc,
std::vector<void*> log_vec,
std::vector<srslte::log*> log_vec,
phy_args_t *args = NULL);
void stop();
@ -159,7 +159,7 @@ private:
const static int WORKERS_THREAD_PRIO = 0;
srslte::radio_multi *radio_handler;
std::vector<void*> log_vec;
std::vector<srslte::log*> log_vec;
srslte::log *log_h;
srslte::log *log_phy_lib_h;
srsue::mac_interface_phy *mac;

View File

@ -101,7 +101,7 @@ private:
srslte::logger *logger;
// rf_log is on ue_base
std::vector<void*> phy_log;
std::vector<srslte::log*> phy_log;
srslte::log_filter mac_log;
srslte::log_filter rlc_log;
srslte::log_filter pdcp_log;