mirror of https://github.com/PentHertz/srsLTE.git
remove unneeded includes of full rrc asn1 lib
This commit is contained in:
parent
3067e81e67
commit
66712023bb
|
@ -24,7 +24,7 @@
|
||||||
#include "pdcp_interface_types.h"
|
#include "pdcp_interface_types.h"
|
||||||
#include "rlc_interface_types.h"
|
#include "rlc_interface_types.h"
|
||||||
#include "rrc_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/asn1/s1ap.h"
|
||||||
#include "srslte/common/common.h"
|
#include "srslte/common/common.h"
|
||||||
#include "srslte/common/interfaces_common.h"
|
#include "srslte/common/interfaces_common.h"
|
||||||
|
@ -46,11 +46,11 @@ public:
|
||||||
/**
|
/**
|
||||||
* DL grant structure per UE
|
* DL grant structure per UE
|
||||||
*/
|
*/
|
||||||
typedef struct {
|
struct dl_sched_grant_t {
|
||||||
srslte_dci_dl_t dci = {};
|
srslte_dci_dl_t dci = {};
|
||||||
uint8_t* data[SRSLTE_MAX_TB] = {};
|
uint8_t* data[SRSLTE_MAX_TB] = {};
|
||||||
srslte_softbuffer_tx_t* softbuffer_tx[SRSLTE_MAX_TB] = {};
|
srslte_softbuffer_tx_t* softbuffer_tx[SRSLTE_MAX_TB] = {};
|
||||||
} dl_sched_grant_t;
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DL Scheduling result per cell/carrier
|
* 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;
|
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
|
bool configured = false; ///< Indicates whether PHY shall consider configuring this cell/carrier
|
||||||
uint32_t enb_cc_idx = 0; ///< eNb Cell index
|
uint32_t enb_cc_idx = 0; ///< eNb Cell index
|
||||||
srslte::phy_cfg_t phy_cfg = {}; ///< Dedicated physical layer configuration
|
srslte::phy_cfg_t phy_cfg = {}; ///< Dedicated physical layer configuration
|
||||||
} phy_rrc_cfg_t;
|
};
|
||||||
|
|
||||||
typedef std::vector<phy_rrc_cfg_t> phy_rrc_cfg_list_t;
|
typedef std::vector<phy_rrc_cfg_t> phy_rrc_cfg_list_t;
|
||||||
|
|
||||||
|
@ -547,12 +547,12 @@ typedef struct {
|
||||||
std::string enb_name;
|
std::string enb_name;
|
||||||
} s1ap_args_t;
|
} s1ap_args_t;
|
||||||
|
|
||||||
typedef struct {
|
struct mac_args_t {
|
||||||
uint32_t nof_prb; ///< Needed to dimension MAC softbuffers for all cells
|
uint32_t nof_prb; ///< Needed to dimension MAC softbuffers for all cells
|
||||||
sched_interface::sched_args_t sched;
|
sched_interface::sched_args_t sched;
|
||||||
int nr_tb_size = -1;
|
int nr_tb_size = -1;
|
||||||
uint32_t max_nof_ues;
|
uint32_t max_nof_ues;
|
||||||
} mac_args_t;
|
};
|
||||||
|
|
||||||
class stack_interface_s1ap_lte
|
class stack_interface_s1ap_lte
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#ifndef SRSLTE_ENB_RRC_INTERFACE_TYPES_H
|
#ifndef SRSLTE_ENB_RRC_INTERFACE_TYPES_H
|
||||||
#define SRSLTE_ENB_RRC_INTERFACE_TYPES_H
|
#define SRSLTE_ENB_RRC_INTERFACE_TYPES_H
|
||||||
|
|
||||||
|
#include "srslte/asn1/rrc/meascfg.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace srsenb {
|
namespace srsenb {
|
||||||
|
|
|
@ -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/bcd_helpers.h"
|
||||||
#include "srslte/common/log_filter.h"
|
#include "srslte/common/log_filter.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
|
@ -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/bcd_helpers.h"
|
||||||
#include "srslte/common/log_filter.h"
|
#include "srslte/common/log_filter.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
|
@ -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/asn1/rrc_utils.h"
|
||||||
#include "srslte/common/bcd_helpers.h"
|
#include "srslte/common/bcd_helpers.h"
|
||||||
#include "srslte/common/log_filter.h"
|
#include "srslte/common/log_filter.h"
|
||||||
|
|
|
@ -20,8 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../../../srsue/hdr/stack/rrc/rrc.h" // for rrc_args_t
|
#include "../../../srsue/hdr/stack/rrc/rrc.h" // for rrc_args_t
|
||||||
#include "srslte/asn1/rrc.h"
|
#include "srslte/asn1/rrc/ul_dcch_msg.h"
|
||||||
#include "srslte/common/bcd_helpers.h"
|
|
||||||
#include "srslte/common/log_filter.h"
|
#include "srslte/common/log_filter.h"
|
||||||
#include "srslte/common/mac_pcap.h"
|
#include "srslte/common/mac_pcap.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "phy/phy.h"
|
#include "phy/phy.h"
|
||||||
#include "srsenb/hdr/stack/rrc/rrc.h"
|
|
||||||
|
|
||||||
#include "srslte/radio/radio.h"
|
#include "srslte/radio/radio.h"
|
||||||
|
|
||||||
|
@ -139,9 +138,9 @@ private:
|
||||||
int parse_args(const all_args_t& args_);
|
int parse_args(const all_args_t& args_);
|
||||||
|
|
||||||
// eNB components
|
// eNB components
|
||||||
std::unique_ptr<enb_stack_base> stack = nullptr;
|
std::unique_ptr<enb_stack_base> stack;
|
||||||
std::unique_ptr<srslte::radio_base> radio = nullptr;
|
std::unique_ptr<srslte::radio_base> radio;
|
||||||
std::unique_ptr<enb_phy_base> phy = nullptr;
|
std::unique_ptr<enb_phy_base> phy;
|
||||||
|
|
||||||
srslte::logger* logger = nullptr;
|
srslte::logger* logger = nullptr;
|
||||||
srslte::log_ref log; // Own logger for eNB
|
srslte::log_ref log; // Own logger for eNB
|
||||||
|
@ -158,9 +157,6 @@ private:
|
||||||
|
|
||||||
srslte::LOG_LEVEL_ENUM level(std::string l);
|
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_mode();
|
||||||
std::string get_build_info();
|
std::string get_build_info();
|
||||||
std::string get_build_string();
|
std::string get_build_string();
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#ifndef SRSENB_PHY_INTERFACES_H_
|
#ifndef SRSENB_PHY_INTERFACES_H_
|
||||||
#define SRSENB_PHY_INTERFACES_H_
|
#define SRSENB_PHY_INTERFACES_H_
|
||||||
|
|
||||||
#include "srslte/asn1/rrc.h"
|
#include "srslte/asn1/rrc/rr_common.h"
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <srslte/common/interfaces_common.h>
|
#include <srslte/common/interfaces_common.h>
|
||||||
#include <srslte/phy/channel/channel.h>
|
#include <srslte/phy/channel/channel.h>
|
||||||
|
|
|
@ -175,8 +175,7 @@ private:
|
||||||
const static uint32_t LCID_REL_USER = 0xffff0002;
|
const static uint32_t LCID_REL_USER = 0xffff0002;
|
||||||
const static uint32_t LCID_ACT_USER = 0xffff0004;
|
const static uint32_t LCID_ACT_USER = 0xffff0004;
|
||||||
|
|
||||||
bool running = false;
|
bool running = false;
|
||||||
static const int RRC_THREAD_PRIO = 65;
|
|
||||||
srslte::block_queue<rrc_pdu> rx_pdu_queue;
|
srslte::block_queue<rrc_pdu> rx_pdu_queue;
|
||||||
|
|
||||||
asn1::rrc::mcch_msg_s mcch;
|
asn1::rrc::mcch_msg_s mcch;
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <pthread.h>
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -437,8 +436,8 @@ static void* input_loop(metrics_stdout* metrics, srsenb::enb_command_interface*
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse command arguments
|
// Parse command arguments
|
||||||
uint32_t cell_id = srslte::string_cast<uint32_t>(cmd[1]);
|
uint32_t cell_id = srslte::string_cast<uint32_t>(cmd[1]);
|
||||||
float gain_db = srslte::string_cast<float>(cmd[2]);
|
float gain_db = srslte::string_cast<float>(cmd[2]);
|
||||||
|
|
||||||
// Set cell gain
|
// Set cell gain
|
||||||
control->cmd_cell_gain(cell_id, gain_db);
|
control->cmd_cell_gain(cell_id, gain_db);
|
||||||
|
|
|
@ -20,8 +20,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srsenb/hdr/phy/txrx.h"
|
#include "srsenb/hdr/phy/txrx.h"
|
||||||
#include "srslte/asn1/rrc.h"
|
|
||||||
#include "srslte/common/log.h"
|
|
||||||
#include "srslte/common/threads.h"
|
#include "srslte/common/threads.h"
|
||||||
#include "srslte/phy/channel/channel.h"
|
#include "srslte/phy/channel/channel.h"
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srsenb/hdr/stack/upper/common_enb.h"
|
#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/asn1/rrc_utils.h"
|
||||||
#include "srslte/common/bcd_helpers.h"
|
#include "srslte/common/bcd_helpers.h"
|
||||||
#include "srslte/interfaces/rrc_interface_types.h"
|
#include "srslte/interfaces/rrc_interface_types.h"
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srsue/hdr/stack/rrc/rrc_meas.h"
|
#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"
|
#include "srsue/hdr/stack/rrc/rrc.h"
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srslte/asn1/rrc.h"
|
#include "srslte/asn1/rrc/rr_common.h"
|
||||||
#include "srslte/asn1/rrc_utils.h"
|
#include "srslte/asn1/rrc_utils.h"
|
||||||
#include "srslte/common/log_filter.h"
|
#include "srslte/common/log_filter.h"
|
||||||
#include "srslte/common/mac_pcap.h"
|
#include "srslte/common/mac_pcap.h"
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srslte/asn1/rrc.h"
|
#include "srslte/asn1/rrc/meascfg.h"
|
||||||
#include "srslte/common/buffer_pool.h"
|
#include "srslte/common/buffer_pool.h"
|
||||||
#include "srslte/common/log_filter.h"
|
#include "srslte/common/log_filter.h"
|
||||||
#include "srslte/common/test_common.h"
|
#include "srslte/common/test_common.h"
|
||||||
|
@ -236,9 +236,7 @@ class rrc_test : public rrc
|
||||||
|
|
||||||
public:
|
public:
|
||||||
rrc_test(srslte::log_ref log_, stack_test_dummy* stack_) :
|
rrc_test(srslte::log_ref log_, stack_test_dummy* stack_) :
|
||||||
rrc(stack_, &stack_->task_sched),
|
rrc(stack_, &stack_->task_sched), stack(stack_), mactest(this, &stack_->task_sched)
|
||||||
stack(stack_),
|
|
||||||
mactest(this, &stack_->task_sched)
|
|
||||||
{
|
{
|
||||||
pool = srslte::byte_buffer_pool::get_instance();
|
pool = srslte::byte_buffer_pool::get_instance();
|
||||||
nastest = std::unique_ptr<nas_test>(new nas_test(&stack->task_sched));
|
nastest = std::unique_ptr<nas_test>(new nas_test(&stack->task_sched));
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "srslte/asn1/liblte_mme.h"
|
#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 "srslte/common/log_filter.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <srslte/srslte.h>
|
#include <srslte/srslte.h>
|
||||||
|
|
Loading…
Reference in New Issue