From edba7f57e40f8adc7ae891e89d679594820fcf6f Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Fri, 22 May 2020 16:40:19 +0100 Subject: [PATCH] corrected mac_nr_pdu includes --- lib/test/upper/rlc_am_nr_pdu_test.cc | 2 +- lib/test/upper/rlc_stress_test.cc | 2 +- lib/test/upper/rlc_um_nr_pdu_test.cc | 2 +- lib/test/upper/rlc_um_nr_test.cc | 2 +- srsenb/hdr/stack/mac/mac_nr.h | 4 ++-- srsenb/src/stack/mac/mac_nr.cc | 2 +- srsue/hdr/stack/mac/mac_nr.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/test/upper/rlc_am_nr_pdu_test.cc b/lib/test/upper/rlc_am_nr_pdu_test.cc index 6be80c292..7e46c2b9a 100644 --- a/lib/test/upper/rlc_am_nr_pdu_test.cc +++ b/lib/test/upper/rlc_am_nr_pdu_test.cc @@ -44,7 +44,7 @@ using namespace srslte; #if PCAP #include "srslte/common/mac_nr_pcap.h" -#include "srslte/common/mac_nr_pdu.h" +#include "srslte/mac/mac_nr_pdu.h" static std::unique_ptr pcap_handle = nullptr; #endif diff --git a/lib/test/upper/rlc_stress_test.cc b/lib/test/upper/rlc_stress_test.cc index 4ac929910..597f11adb 100644 --- a/lib/test/upper/rlc_stress_test.cc +++ b/lib/test/upper/rlc_stress_test.cc @@ -41,7 +41,7 @@ #if PCAP #include "srslte/common/mac_nr_pcap.h" -#include "srslte/common/mac_nr_pdu.h" +#include "srslte/mac/mac_nr_pdu.h" static std::unique_ptr pcap_handle = nullptr; #endif diff --git a/lib/test/upper/rlc_um_nr_pdu_test.cc b/lib/test/upper/rlc_um_nr_pdu_test.cc index f3e4629c7..17571622f 100644 --- a/lib/test/upper/rlc_um_nr_pdu_test.cc +++ b/lib/test/upper/rlc_um_nr_pdu_test.cc @@ -44,7 +44,7 @@ using namespace srslte; #if PCAP #include "srslte/common/mac_nr_pcap.h" -#include "srslte/common/mac_nr_pdu.h" +#include "srslte/mac/mac_nr_pdu.h" static std::unique_ptr pcap_handle = nullptr; #endif diff --git a/lib/test/upper/rlc_um_nr_test.cc b/lib/test/upper/rlc_um_nr_test.cc index 50939c071..bc8536817 100644 --- a/lib/test/upper/rlc_um_nr_test.cc +++ b/lib/test/upper/rlc_um_nr_test.cc @@ -46,7 +46,7 @@ using namespace srslte; #if PCAP #include "srslte/common/mac_nr_pcap.h" -#include "srslte/common/mac_nr_pdu.h" +#include "srslte/mac/mac_nr_pdu.h" static std::unique_ptr pcap_handle = nullptr; #endif diff --git a/srsenb/hdr/stack/mac/mac_nr.h b/srsenb/hdr/stack/mac/mac_nr.h index d373e3617..0bb65bc14 100644 --- a/srsenb/hdr/stack/mac/mac_nr.h +++ b/srsenb/hdr/stack/mac/mac_nr.h @@ -24,7 +24,7 @@ #include "srslte/common/logmap.h" #include "srslte/common/mac_nr_pcap.h" -#include "srslte/common/mac_nr_pdu.h" +#include "srslte/mac/mac_nr_pdu.h" #include "srsenb/hdr/stack/enb_stack_base.h" #include "srslte/interfaces/enb_metrics_interface.h" @@ -48,7 +48,7 @@ struct mac_nr_args_t { class mac_nr : public mac_interface_phy_nr, public mac_interface_rrc_nr, public mac_interface_rlc_nr { public: - mac_nr(srslte::logger* logger_); + mac_nr(); ~mac_nr(); int init(const mac_nr_args_t& args_, diff --git a/srsenb/src/stack/mac/mac_nr.cc b/srsenb/src/stack/mac/mac_nr.cc index ba97a6215..7b7b196cf 100644 --- a/srsenb/src/stack/mac/mac_nr.cc +++ b/srsenb/src/stack/mac/mac_nr.cc @@ -33,7 +33,7 @@ namespace srsenb { -mac_nr::mac_nr(srslte::logger* logger_) : pool(srslte::byte_buffer_pool::get_instance()), log_h("MAC") +mac_nr::mac_nr() : pool(srslte::byte_buffer_pool::get_instance()), log_h("MAC") { bcch_bch_payload = srslte::allocate_unique_buffer(*pool); diff --git a/srsue/hdr/stack/mac/mac_nr.h b/srsue/hdr/stack/mac/mac_nr.h index e44492cf2..d6ce1d896 100644 --- a/srsue/hdr/stack/mac/mac_nr.h +++ b/srsue/hdr/stack/mac/mac_nr.h @@ -25,8 +25,8 @@ #include "srslte/common/block_queue.h" #include "srslte/common/logmap.h" #include "srslte/common/mac_nr_pcap.h" -#include "srslte/common/mac_nr_pdu.h" #include "srslte/interfaces/ue_nr_interfaces.h" +#include "srslte/mac/mac_nr_pdu.h" #include "srsue/hdr/stack/mac/mux.h" #include "srsue/hdr/stack/ue_stack_base.h"