From 66712023bbf3b6b03bf90607c366a881138ed2fc Mon Sep 17 00:00:00 2001 From: Francisco Date: Sat, 21 Nov 2020 00:49:09 +0000 Subject: [PATCH] remove unneeded includes of full rrc asn1 lib --- lib/include/srslte/interfaces/enb_interfaces.h | 14 +++++++------- .../srslte/interfaces/enb_rrc_interface_types.h | 1 + lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc | 2 +- lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc | 2 +- lib/test/asn1/srslte_asn1_rrc_meas_test.cc | 2 +- lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc | 3 +-- srsenb/hdr/enb.h | 10 +++------- srsenb/hdr/phy/phy_interfaces.h | 2 +- srsenb/hdr/stack/rrc/rrc.h | 3 +-- srsenb/src/main.cc | 5 ++--- srsenb/src/phy/phy_common.cc | 2 -- srsenb/test/upper/plmn_test.cc | 2 +- srsue/src/stack/rrc/rrc_meas.cc | 2 +- srsue/test/mac_test.cc | 2 +- srsue/test/upper/rrc_meas_test.cc | 6 ++---- srsue/test/upper/rrc_reconfig_test.cc | 2 +- 16 files changed, 25 insertions(+), 35 deletions(-) diff --git a/lib/include/srslte/interfaces/enb_interfaces.h b/lib/include/srslte/interfaces/enb_interfaces.h index 74b218dbc..e3665673e 100644 --- a/lib/include/srslte/interfaces/enb_interfaces.h +++ b/lib/include/srslte/interfaces/enb_interfaces.h @@ -24,7 +24,7 @@ #include "pdcp_interface_types.h" #include "rlc_interface_types.h" #include "rrc_interface_types.h" -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc_utils.h" #include "srslte/asn1/s1ap.h" #include "srslte/common/common.h" #include "srslte/common/interfaces_common.h" @@ -46,11 +46,11 @@ public: /** * DL grant structure per UE */ - typedef struct { + struct dl_sched_grant_t { srslte_dci_dl_t dci = {}; uint8_t* data[SRSLTE_MAX_TB] = {}; srslte_softbuffer_tx_t* softbuffer_tx[SRSLTE_MAX_TB] = {}; - } dl_sched_grant_t; + }; /** * DL Scheduling result per cell/carrier @@ -228,11 +228,11 @@ public: virtual void configure_mbsfn(srslte::sib2_mbms_t* sib2, srslte::sib13_t* sib13, const srslte::mcch_msg_t& mcch) = 0; - typedef struct { + struct phy_rrc_cfg_t { bool configured = false; ///< Indicates whether PHY shall consider configuring this cell/carrier uint32_t enb_cc_idx = 0; ///< eNb Cell index srslte::phy_cfg_t phy_cfg = {}; ///< Dedicated physical layer configuration - } phy_rrc_cfg_t; + }; typedef std::vector phy_rrc_cfg_list_t; @@ -547,12 +547,12 @@ typedef struct { std::string enb_name; } s1ap_args_t; -typedef struct { +struct mac_args_t { uint32_t nof_prb; ///< Needed to dimension MAC softbuffers for all cells sched_interface::sched_args_t sched; int nr_tb_size = -1; uint32_t max_nof_ues; -} mac_args_t; +}; class stack_interface_s1ap_lte { diff --git a/lib/include/srslte/interfaces/enb_rrc_interface_types.h b/lib/include/srslte/interfaces/enb_rrc_interface_types.h index 2bbbbadcb..f04e40903 100644 --- a/lib/include/srslte/interfaces/enb_rrc_interface_types.h +++ b/lib/include/srslte/interfaces/enb_rrc_interface_types.h @@ -22,6 +22,7 @@ #ifndef SRSLTE_ENB_RRC_INTERFACE_TYPES_H #define SRSLTE_ENB_RRC_INTERFACE_TYPES_H +#include "srslte/asn1/rrc/meascfg.h" #include namespace srsenb { diff --git a/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc b/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc index b75124cdb..6723c816d 100644 --- a/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc +++ b/lib/test/asn1/srslte_asn1_rrc_dl_ccch_test.cc @@ -19,7 +19,7 @@ * */ -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/dl_ccch_msg.h" #include "srslte/common/bcd_helpers.h" #include "srslte/common/log_filter.h" #include diff --git a/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc b/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc index 4061bb4c5..bdc9289fa 100644 --- a/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc +++ b/lib/test/asn1/srslte_asn1_rrc_dl_dcch_test.cc @@ -19,7 +19,7 @@ * */ -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/dl_dcch_msg.h" #include "srslte/common/bcd_helpers.h" #include "srslte/common/log_filter.h" #include diff --git a/lib/test/asn1/srslte_asn1_rrc_meas_test.cc b/lib/test/asn1/srslte_asn1_rrc_meas_test.cc index 2c480b523..77df8ee41 100644 --- a/lib/test/asn1/srslte_asn1_rrc_meas_test.cc +++ b/lib/test/asn1/srslte_asn1_rrc_meas_test.cc @@ -19,7 +19,7 @@ * */ -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/ul_dcch_msg.h" #include "srslte/asn1/rrc_utils.h" #include "srslte/common/bcd_helpers.h" #include "srslte/common/log_filter.h" diff --git a/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc b/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc index beec7a0cf..a71ffdba3 100644 --- a/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc +++ b/lib/test/asn1/srslte_asn1_rrc_ul_dcch_test.cc @@ -20,8 +20,7 @@ */ #include "../../../srsue/hdr/stack/rrc/rrc.h" // for rrc_args_t -#include "srslte/asn1/rrc.h" -#include "srslte/common/bcd_helpers.h" +#include "srslte/asn1/rrc/ul_dcch_msg.h" #include "srslte/common/log_filter.h" #include "srslte/common/mac_pcap.h" #include diff --git a/srsenb/hdr/enb.h b/srsenb/hdr/enb.h index c3f767e93..b2effc1a5 100644 --- a/srsenb/hdr/enb.h +++ b/srsenb/hdr/enb.h @@ -33,7 +33,6 @@ #include #include "phy/phy.h" -#include "srsenb/hdr/stack/rrc/rrc.h" #include "srslte/radio/radio.h" @@ -139,9 +138,9 @@ private: int parse_args(const all_args_t& args_); // eNB components - std::unique_ptr stack = nullptr; - std::unique_ptr radio = nullptr; - std::unique_ptr phy = nullptr; + std::unique_ptr stack; + std::unique_ptr radio; + std::unique_ptr phy; srslte::logger* logger = nullptr; srslte::log_ref log; // Own logger for eNB @@ -158,9 +157,6 @@ private: srslte::LOG_LEVEL_ENUM level(std::string l); - // bool check_srslte_version(); - int parse_cell_cfg(all_args_t* args, srslte_cell_t* cell); - std::string get_build_mode(); std::string get_build_info(); std::string get_build_string(); diff --git a/srsenb/hdr/phy/phy_interfaces.h b/srsenb/hdr/phy/phy_interfaces.h index db334f1b3..01ecc1236 100644 --- a/srsenb/hdr/phy/phy_interfaces.h +++ b/srsenb/hdr/phy/phy_interfaces.h @@ -22,7 +22,7 @@ #ifndef SRSENB_PHY_INTERFACES_H_ #define SRSENB_PHY_INTERFACES_H_ -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/rr_common.h" #include #include #include diff --git a/srsenb/hdr/stack/rrc/rrc.h b/srsenb/hdr/stack/rrc/rrc.h index f48130327..004fce3f8 100644 --- a/srsenb/hdr/stack/rrc/rrc.h +++ b/srsenb/hdr/stack/rrc/rrc.h @@ -175,8 +175,7 @@ private: const static uint32_t LCID_REL_USER = 0xffff0002; const static uint32_t LCID_ACT_USER = 0xffff0004; - bool running = false; - static const int RRC_THREAD_PRIO = 65; + bool running = false; srslte::block_queue rx_pdu_queue; asn1::rrc::mcch_msg_s mcch; diff --git a/srsenb/src/main.cc b/srsenb/src/main.cc index be8433e5f..befcbd6c0 100644 --- a/srsenb/src/main.cc +++ b/srsenb/src/main.cc @@ -20,7 +20,6 @@ */ #include -#include #include #include #include @@ -437,8 +436,8 @@ static void* input_loop(metrics_stdout* metrics, srsenb::enb_command_interface* } // Parse command arguments - uint32_t cell_id = srslte::string_cast(cmd[1]); - float gain_db = srslte::string_cast(cmd[2]); + uint32_t cell_id = srslte::string_cast(cmd[1]); + float gain_db = srslte::string_cast(cmd[2]); // Set cell gain control->cmd_cell_gain(cell_id, gain_db); diff --git a/srsenb/src/phy/phy_common.cc b/srsenb/src/phy/phy_common.cc index 785a87e95..a7f7132e1 100644 --- a/srsenb/src/phy/phy_common.cc +++ b/srsenb/src/phy/phy_common.cc @@ -20,8 +20,6 @@ */ #include "srsenb/hdr/phy/txrx.h" -#include "srslte/asn1/rrc.h" -#include "srslte/common/log.h" #include "srslte/common/threads.h" #include "srslte/phy/channel/channel.h" #include diff --git a/srsenb/test/upper/plmn_test.cc b/srsenb/test/upper/plmn_test.cc index 31dcf9037..af88bea1f 100644 --- a/srsenb/test/upper/plmn_test.cc +++ b/srsenb/test/upper/plmn_test.cc @@ -20,7 +20,7 @@ */ #include "srsenb/hdr/stack/upper/common_enb.h" -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/common.h" #include "srslte/asn1/rrc_utils.h" #include "srslte/common/bcd_helpers.h" #include "srslte/interfaces/rrc_interface_types.h" diff --git a/srsue/src/stack/rrc/rrc_meas.cc b/srsue/src/stack/rrc/rrc_meas.cc index ee35bd7f9..87b55bfba 100644 --- a/srsue/src/stack/rrc/rrc_meas.cc +++ b/srsue/src/stack/rrc/rrc_meas.cc @@ -20,7 +20,7 @@ */ #include "srsue/hdr/stack/rrc/rrc_meas.h" -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/dl_dcch_msg.h" #include "srsue/hdr/stack/rrc/rrc.h" /************************************************************************ diff --git a/srsue/test/mac_test.cc b/srsue/test/mac_test.cc index 97b72f32b..a0718e562 100644 --- a/srsue/test/mac_test.cc +++ b/srsue/test/mac_test.cc @@ -19,7 +19,7 @@ * */ -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/rr_common.h" #include "srslte/asn1/rrc_utils.h" #include "srslte/common/log_filter.h" #include "srslte/common/mac_pcap.h" diff --git a/srsue/test/upper/rrc_meas_test.cc b/srsue/test/upper/rrc_meas_test.cc index 0f7ba8c58..dee975d1a 100644 --- a/srsue/test/upper/rrc_meas_test.cc +++ b/srsue/test/upper/rrc_meas_test.cc @@ -19,7 +19,7 @@ * */ -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/meascfg.h" #include "srslte/common/buffer_pool.h" #include "srslte/common/log_filter.h" #include "srslte/common/test_common.h" @@ -236,9 +236,7 @@ class rrc_test : public rrc public: rrc_test(srslte::log_ref log_, stack_test_dummy* stack_) : - rrc(stack_, &stack_->task_sched), - stack(stack_), - mactest(this, &stack_->task_sched) + rrc(stack_, &stack_->task_sched), stack(stack_), mactest(this, &stack_->task_sched) { pool = srslte::byte_buffer_pool::get_instance(); nastest = std::unique_ptr(new nas_test(&stack->task_sched)); diff --git a/srsue/test/upper/rrc_reconfig_test.cc b/srsue/test/upper/rrc_reconfig_test.cc index 349d625d8..4ed967616 100644 --- a/srsue/test/upper/rrc_reconfig_test.cc +++ b/srsue/test/upper/rrc_reconfig_test.cc @@ -20,7 +20,7 @@ */ #include "srslte/asn1/liblte_mme.h" -#include "srslte/asn1/rrc.h" +#include "srslte/asn1/rrc/dl_dcch_msg.h" #include "srslte/common/log_filter.h" #include #include