mirror of https://github.com/PentHertz/srsLTE.git
gnb,rrc: add GTPU interface to RRC
This commit is contained in:
parent
4923f0a07b
commit
f17e77f391
|
@ -56,6 +56,7 @@ public:
|
|||
rlc_interface_rrc* rlc,
|
||||
pdcp_interface_rrc* pdcp,
|
||||
ngap_interface_rrc_nr* ngap_,
|
||||
gtpu_interface_rrc* gtpu_,
|
||||
enb_bearer_manager& bearer_mapper_,
|
||||
rrc_eutra_interface_rrc_nr* rrc_eutra_);
|
||||
|
||||
|
@ -128,6 +129,7 @@ private:
|
|||
rlc_interface_rrc* rlc = nullptr;
|
||||
pdcp_interface_rrc* pdcp = nullptr;
|
||||
ngap_interface_rrc_nr* ngap = nullptr;
|
||||
gtpu_interface_rrc* gtpu = nullptr;
|
||||
rrc_eutra_interface_rrc_nr* rrc_eutra = nullptr;
|
||||
enb_bearer_manager* bearer_mapper = nullptr;
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ int gnb_stack_nr::init(const gnb_stack_args_t& args_,
|
|||
|
||||
rlc.init(&pdcp, &rrc, &mac, task_sched.get_timer_handler());
|
||||
|
||||
if (rrc.init(rrc_cfg_, phy, &mac, &rlc, &pdcp, ngap.get(), *bearer_manager, x2_) != SRSRAN_SUCCESS) {
|
||||
if (rrc.init(rrc_cfg_, phy, &mac, &rlc, &pdcp, ngap.get(), gtpu.get(), *bearer_manager, x2_) != SRSRAN_SUCCESS) {
|
||||
stack_logger.error("Couldn't initialize RRC");
|
||||
return SRSRAN_ERROR;
|
||||
}
|
||||
|
|
|
@ -39,6 +39,7 @@ int rrc_nr::init(const rrc_nr_cfg_t& cfg_,
|
|||
rlc_interface_rrc* rlc_,
|
||||
pdcp_interface_rrc* pdcp_,
|
||||
ngap_interface_rrc_nr* ngap_,
|
||||
gtpu_interface_rrc* gtpu_,
|
||||
enb_bearer_manager& bearer_mapper_,
|
||||
rrc_eutra_interface_rrc_nr* rrc_eutra_)
|
||||
{
|
||||
|
@ -47,6 +48,7 @@ int rrc_nr::init(const rrc_nr_cfg_t& cfg_,
|
|||
rlc = rlc_;
|
||||
pdcp = pdcp_;
|
||||
ngap = ngap_;
|
||||
gtpu = gtpu_;
|
||||
bearer_mapper = &bearer_mapper_;
|
||||
rrc_eutra = rrc_eutra_;
|
||||
|
||||
|
|
|
@ -160,7 +160,8 @@ void test_rrc_sa_ngap_integration(ngap_args_t ngap_args)
|
|||
set_derived_nr_cell_params(rrc_cfg_nr.is_standalone, rrc_cfg_nr.cell_list[0]);
|
||||
srsran_assert(check_rrc_nr_cfg_valid(rrc_cfg_nr) == SRSRAN_SUCCESS, "Invalid RRC NR configuration");
|
||||
|
||||
TESTASSERT(rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, bearer_mapper, nullptr) ==
|
||||
TESTASSERT(
|
||||
rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, >pu_obj, bearer_mapper, nullptr) ==
|
||||
SRSRAN_SUCCESS);
|
||||
|
||||
sched_nr_ue_cfg_t uecfg = get_default_ue_cfg(1);
|
||||
|
|
|
@ -64,7 +64,8 @@ void test_sib_generation()
|
|||
set_derived_nr_cell_params(rrc_cfg_nr.is_standalone, rrc_cfg_nr.cell_list[0]);
|
||||
srsran_assert(check_rrc_nr_cfg_valid(rrc_cfg_nr) == SRSRAN_SUCCESS, "Invalid RRC NR configuration");
|
||||
|
||||
TESTASSERT(rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, nullptr, bearer_mapper, nullptr) ==
|
||||
TESTASSERT(
|
||||
rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, nullptr, nullptr, bearer_mapper, nullptr) ==
|
||||
SRSRAN_SUCCESS);
|
||||
|
||||
const sched_nr_interface::cell_cfg_t& nrcell = mac_obj.nr_cells.at(0);
|
||||
|
@ -119,7 +120,8 @@ int test_rrc_setup()
|
|||
srsran::string_to_mnc("01", &rrc_cfg_nr.mnc);
|
||||
set_derived_nr_cell_params(rrc_cfg_nr.is_standalone, rrc_cfg_nr.cell_list[0]);
|
||||
srsran_assert(check_rrc_nr_cfg_valid(rrc_cfg_nr) == SRSRAN_SUCCESS, "Invalid RRC NR configuration");
|
||||
TESTASSERT(rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, nullptr, bearer_mapper, nullptr) ==
|
||||
TESTASSERT(
|
||||
rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, nullptr, nullptr, bearer_mapper, nullptr) ==
|
||||
SRSRAN_SUCCESS);
|
||||
|
||||
for (uint32_t n = 0; n < 2; ++n) {
|
||||
|
@ -163,7 +165,8 @@ void test_rrc_sa_connection()
|
|||
set_derived_nr_cell_params(rrc_cfg_nr.is_standalone, rrc_cfg_nr.cell_list[0]);
|
||||
srsran_assert(check_rrc_nr_cfg_valid(rrc_cfg_nr) == SRSRAN_SUCCESS, "Invalid RRC NR configuration");
|
||||
|
||||
TESTASSERT(rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, bearer_mapper, nullptr) ==
|
||||
TESTASSERT(
|
||||
rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, nullptr, bearer_mapper, nullptr) ==
|
||||
SRSRAN_SUCCESS);
|
||||
|
||||
sched_nr_ue_cfg_t uecfg = get_default_ue_cfg(1);
|
||||
|
|
Loading…
Reference in New Issue