SRSENB: phy method cleanup and CLang tidy warning fixes

This commit is contained in:
Xavier Arteaga 2020-02-23 18:05:55 +01:00 committed by Xavier Arteaga
parent 4c61ffd391
commit 2a6f54e13f
2 changed files with 11 additions and 24 deletions

View File

@ -36,7 +36,7 @@
namespace srsenb {
class phy : public enb_phy_base, public phy_interface_stack_lte, public srslte::phy_interface_radio
class phy final : public enb_phy_base, public phy_interface_stack_lte, public srslte::phy_interface_radio
{
public:
phy(srslte::logger* logger_);
@ -46,36 +46,33 @@ public:
const phy_cfg_t& cfg,
srslte::radio_interface_phy* radio_,
stack_interface_phy_lte* stack_);
void stop();
void stop() override;
std::string get_type() { return "lte"; };
std::string get_type() override { return "lte"; };
/* MAC->PHY interface */
int add_rnti(uint16_t rnti, uint32_t pcell_index, bool is_temporal) final;
int add_rnti(uint16_t rnti, uint32_t pcell_index, bool is_temporal) override;
void rem_rnti(uint16_t rnti) final;
void set_mch_period_stop(uint32_t stop) final;
void set_activation_deactivation_scell(uint16_t rnti, bool activation[SRSLTE_MAX_CARRIERS]);
void set_activation_deactivation_scell(uint16_t rnti, bool activation[SRSLTE_MAX_CARRIERS]) override;
/*RRC-PHY interface*/
void configure_mbsfn(asn1::rrc::sib_type2_s* sib2, asn1::rrc::sib_type13_r9_s* sib13, asn1::rrc::mcch_msg_s mcch);
void
configure_mbsfn(asn1::rrc::sib_type2_s* sib2, asn1::rrc::sib_type13_r9_s* sib13, asn1::rrc::mcch_msg_s mcch) override;
static uint32_t tti_to_SFN(uint32_t tti);
static uint32_t tti_to_subf(uint32_t tti);
void start_plot();
void start_plot() override;
void set_config_dedicated(uint16_t rnti, const phy_rrc_dedicated_list_t& dedicated_list) override;
void get_metrics(phy_metrics_t metrics[ENB_METRICS_MAX_USERS]);
void get_metrics(phy_metrics_t metrics[ENB_METRICS_MAX_USERS]) override;
void radio_overflow(){};
void radio_failure(){};
void radio_overflow() override{};
void radio_failure() override{};
private:
phy_rrc_cfg_t phy_rrc_config = {};
uint32_t nof_workers = 0;
const static int MAX_WORKERS = 4;
const static int DEFAULT_WORKERS = 2;
const static int PRACH_WORKER_THREAD_PRIO = 3;
const static int SF_RECV_THREAD_PRIO = 1;

View File

@ -181,16 +181,6 @@ void phy::stop()
}
}
uint32_t phy::tti_to_SFN(uint32_t tti)
{
return tti / 10;
}
uint32_t phy::tti_to_subf(uint32_t tti)
{
return tti % 10;
}
/***** MAC->PHY interface **********/
int phy::add_rnti(uint16_t rnti, uint32_t pcell_index, bool is_temporal)
{