PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Andre Puschmann 2018-01-23 15:21:39 +01:00
parent d950aa925d 6a9a004311
commit c08ee3f3ea
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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)

2
cmake/modules/FindFFTW3F.cmake
View File

@ -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 )

2
srsenb/src/mac/mac.cc
View File

@ -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++;

2
srsenb/src/phy/phy.cc
View File

@ -94,7 +94,7 @@ bool phy::init(phy_args_t *args,
{
std::vector<void*> log_vec;
for (int i=0;i<args->nof_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;