mirror of https://github.com/PentHertz/srsLTE.git
add tb size as argument to gnb
This commit is contained in:
parent
2f8dad03cc
commit
42969ad992
|
@ -545,6 +545,7 @@ typedef struct {
|
|||
uint32_t nof_prb; ///< Needed to dimension MAC softbuffers for all cells
|
||||
sched_interface::sched_args_t sched;
|
||||
int link_failure_nof_err;
|
||||
int nr_tb_size = -1;
|
||||
} mac_args_t;
|
||||
|
||||
class stack_interface_s1ap_lte
|
||||
|
|
|
@ -32,8 +32,7 @@ rlc_um_nr::rlc_um_nr(srslte::log_ref log_,
|
|||
srsue::rrc_interface_rlc* rrc_,
|
||||
srslte::timer_handler* timers_) :
|
||||
rlc_um_base(log_, lcid_, pdcp_, rrc_, timers_)
|
||||
{
|
||||
}
|
||||
{}
|
||||
|
||||
rlc_um_nr::~rlc_um_nr()
|
||||
{
|
||||
|
@ -216,8 +215,7 @@ void rlc_um_nr::rlc_um_nr_tx::debug_state()
|
|||
rlc_um_nr::rlc_um_nr_rx::rlc_um_nr_rx(rlc_um_base* parent_) :
|
||||
rlc_um_base_rx(parent_),
|
||||
reassembly_timer(timers->get_unique_timer())
|
||||
{
|
||||
}
|
||||
{}
|
||||
|
||||
bool rlc_um_nr::rlc_um_nr_rx::configure()
|
||||
{
|
||||
|
|
|
@ -200,6 +200,7 @@ void parse_args(all_args_t* args, int argc, char* argv[])
|
|||
|
||||
// NR section
|
||||
("enb.stack", bpo::value<string>(&args->stack.type)->default_value("lte"), "Type of the upper stack [lte]")
|
||||
("scheduler.tb_len", bpo::value<int>(&args->stack.mac.nr_tb_size)->default_value(1520), "Default TB size")
|
||||
|
||||
// VNF params
|
||||
("vnf.type", bpo::value<string>(&args->phy.vnf_args.type)->default_value("gnb"), "VNF instance type [gnb,ue]")
|
||||
|
|
|
@ -78,10 +78,13 @@ int gnb_stack_nr::init(const srsenb::stack_args_t& args_, const rrc_nr_cfg_t& rr
|
|||
mac_args.log_hex_limit = args.log.mac_hex_limit;
|
||||
mac_args.pcap = args.mac_pcap;
|
||||
mac_args.sched = args.mac.sched;
|
||||
mac_args.tb_size = args.mac.nr_tb_size;
|
||||
mac_args.rnti = args.coreless.rnti;
|
||||
mac_args.drb_lcid = args.coreless.drb_lcid;
|
||||
m_mac->init(mac_args, phy, this, m_rlc.get(), m_rrc.get());
|
||||
|
||||
srslte::logmap::get("RLC")->set_level(args.log.rlc_level);
|
||||
srslte::logmap::get("RLC")->set_hex_limit(args.log.rlc_hex_limit);
|
||||
m_rlc->init(m_pdcp.get(), m_rrc.get(), m_mac.get(), &timers);
|
||||
|
||||
pdcp_nr_args_t pdcp_args = {};
|
||||
|
|
|
@ -39,6 +39,9 @@ void pdcp_nr::init(const pdcp_nr_args_t& args_,
|
|||
m_rlc = rlc_;
|
||||
m_rrc = rrc_;
|
||||
m_sdap = sdap_;
|
||||
|
||||
m_log->set_level(m_args.log_level);
|
||||
m_log->set_hex_limit(m_args.log_hex_limit);
|
||||
}
|
||||
|
||||
void pdcp_nr::stop()
|
||||
|
|
|
@ -53,7 +53,7 @@ void rlc_nr::add_user(uint16_t rnti)
|
|||
user_itf.m_pdcp = m_pdcp;
|
||||
user_itf.m_rrc = m_rrc;
|
||||
user_itf.parent = this;
|
||||
user_itf.m_rlc.reset(new srslte::rlc("RLC"));
|
||||
user_itf.m_rlc.reset(new srslte::rlc(m_log->get_service_name().c_str()));
|
||||
users[rnti] = std::move(user_itf);
|
||||
users[rnti].m_rlc->init(&users[rnti], &users[rnti], timers, (int)srslte::rb_id_nr_t::NR_SRB0);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue