remove extra indirection from enb_phy

This commit is contained in:
Andre Puschmann 2019-07-05 21:31:49 +02:00
parent 4e86b2f6b2
commit e0b583db5d
2 changed files with 2 additions and 54 deletions

View File

@ -1,52 +0,0 @@
/*
* Copyright 2013-2019 Software Radio Systems Limited
*
* This file is part of srsLTE.
*
* srsLTE is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version.
*
* srsLTE is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* A copy of the GNU Affero General Public License can be found in
* the LICENSE file in the top-level directory of this distribution
* and at http://www.gnu.org/licenses/.
*
*/
/******************************************************************************
* File: enb_lte_phy_base.h
* Description: Base class for eNB LTE PHYs.
*****************************************************************************/
#ifndef SRSENB_LTE_PHY_BASE_H
#define SRSENB_LTE_PHY_BASE_H
#include "srsenb/hdr/phy/enb_phy_base.h"
#include "srslte/interfaces/common_interfaces.h"
namespace srsenb {
class enb_lte_phy_base : public enb_phy_base, public phy_interface_stack_lte, public srslte::phy_interface_radio
{
public:
enb_lte_phy_base(){};
virtual ~enb_lte_phy_base(){};
virtual std::string get_type() = 0;
virtual void stop() = 0;
virtual void start_plot() = 0;
virtual void get_metrics(phy_metrics_t* m) = 0;
};
} // namespace srsenb
#endif // SRSENB_LTE_PHY_BASE_H

View File

@ -24,7 +24,7 @@
#include "phy_common.h"
#include "sf_worker.h"
#include "srsenb/hdr/phy/enb_lte_phy_base.h"
#include "srsenb/hdr/phy/enb_phy_base.h"
#include "srslte/common/log.h"
#include "srslte/common/log_filter.h"
#include "srslte/common/trace.h"
@ -45,7 +45,7 @@ typedef struct {
asn1::rrc::srs_ul_cfg_common_c srs_ul_cnfg;
} phy_cfg_t;
class phy : public enb_lte_phy_base
class phy : public enb_phy_base, public phy_interface_stack_lte, public srslte::phy_interface_radio
{
public:
phy(srslte::logger* logger_);