Merge branch 'master' into next

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)
 

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 )

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

srsenb/src/phy/phy.cc

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