From cc420d1cb9813a1dbda8c2eb1f710f2efc88ba70 Mon Sep 17 00:00:00 2001 From: Joseph Giovatto Date: Mon, 13 Nov 2017 13:36:39 -0500 Subject: [PATCH 1/3] use vector push_back method to allocate required storgae for log service objects vs using index operator. --- srsenb/src/phy/phy.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srsenb/src/phy/phy.cc b/srsenb/src/phy/phy.cc index c0d0a73c9..87cd1a994 100644 --- a/srsenb/src/phy/phy.cc +++ b/srsenb/src/phy/phy.cc @@ -91,7 +91,7 @@ bool phy::init(phy_args_t *args, { std::vector log_vec; for (int i=0;inof_phy_threads;i++) { - log_vec[i] = (void*) log_h; + log_vec.push_back((void*)log_h); } init(args, cfg, radio_handler_, mac, log_vec); return true; From 051d884a4646b61510700e512d2229bb4bd0e4fa Mon Sep 17 00:00:00 2001 From: David Rupprecht Date: Sun, 21 Jan 2018 11:55:54 +0100 Subject: [PATCH 2/3] fixed enb pcap mac --- srsenb/src/mac/mac.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srsenb/src/mac/mac.cc b/srsenb/src/mac/mac.cc index 74130efaa..f7a4d5b55 100644 --- a/srsenb/src/mac/mac.cc +++ b/srsenb/src/mac/mac.cc @@ -519,7 +519,7 @@ int mac::get_dl_sched(uint32_t tti, dl_sched_t *dl_sched_res) if (pcap) { - pcap->write_dl_ranti(dl_sched_res->sched_grants[n].data[0], sched_result.data[i].tbs[0], dl_sched_res->sched_grants[n].rnti, true, tti); + pcap->write_dl_ranti(dl_sched_res->sched_grants[n].data[0], sched_result.rar[i].tbs, dl_sched_res->sched_grants[n].rnti, true, tti); } n++; From 5a35cef4b0d9619db72832889fb02b444c690236 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Tue, 21 Nov 2017 13:56:29 +0100 Subject: [PATCH 3/3] remove static FFTW library as strict dependency --- CMakeLists.txt | 1 + cmake/modules/FindFFTW3F.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad478f047..a21ed4fa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,7 @@ else(MKL_FOUND) else(BUILD_STATIC) set(FFT_LIBRARIES "${FFTW3F_LIBRARIES}") endif(BUILD_STATIC) + message(STATUS "FFT_LIBRARIES: " ${FFT_LIBRARIES}) endif(FFTW3F_FOUND) endif(MKL_FOUND) diff --git a/cmake/modules/FindFFTW3F.cmake b/cmake/modules/FindFFTW3F.cmake index ef7bc1397..b699182f0 100644 --- a/cmake/modules/FindFFTW3F.cmake +++ b/cmake/modules/FindFFTW3F.cmake @@ -39,6 +39,6 @@ include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set FFTW3F_FOUND to TRUE # if all listed variables are TRUE find_package_handle_standard_args(fftw3f DEFAULT_MSG - FFTW3F_LIBRARY FFTW3F_STATIC_LIBRARY FFTW3F_INCLUDE_DIR) + FFTW3F_LIBRARY FFTW3F_INCLUDE_DIR) mark_as_advanced(FFTW3F_INCLUDE_DIR FFTW3F_STATIC_LIBRARY FFTW3F_LIBRARY )