mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mmajoral-fix_fpga_post_proc_mode_progr_termination' into next

Browse Source
This commit is contained in:
Carles Fernandez 2020-07-01 20:06:19 +02:00
commit 1330e62da9
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
View File

@ -146,7 +146,7 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
freq_band = "L1L2"; freq_band = "L1L2";
} }
thread_file_to_dma = std::thread([&] { run_DMA_process(freq_band, filename_rx1, filename_rx2, enable_DMA_); }); thread_file_to_dma = std::thread([&] { run_DMA_process(freq_band, filename_rx1, filename_rx2); });
} }
if (switch_position == 2) // Real-time via AD9361 if (switch_position == 2) // Real-time via AD9361
{ {
@ -304,7 +304,9 @@ Ad9361FpgaSignalSource::~Ad9361FpgaSignalSource()
/* cleanup and exit */ /* cleanup and exit */
if (switch_position == 0) // read samples from a file via DMA if (switch_position == 0) // read samples from a file via DMA
{ {
std::unique_lock<std::mutex> lock(dma_mutex);
enable_DMA_ = false; // disable the DMA enable_DMA_ = false; // disable the DMA
lock.unlock();
if (thread_file_to_dma.joinable()) if (thread_file_to_dma.joinable())
{ {
thread_file_to_dma.join(); thread_file_to_dma.join();
@ -336,7 +338,7 @@ Ad9361FpgaSignalSource::~Ad9361FpgaSignalSource()
} }
void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const std::string &Filename1, const std::string &Filename2, bool enable_DMA) void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const std::string &Filename1, const std::string &Filename2)
{ {
const int MAX_INPUT_SAMPLES_TOTAL = 16384; const int MAX_INPUT_SAMPLES_TOTAL = 16384;
int max_value = 0; int max_value = 0;
@ -390,7 +392,7 @@ void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const
//************************************************************************** //**************************************************************************
int nsamples = 0; int nsamples = 0;
while ((file_completed == 0) && (enable_DMA == true)) while ((file_completed == 0))
{ {
unsigned int dma_index = 0; unsigned int dma_index = 0;
@ -410,7 +412,7 @@ void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const
} }
else else
{ {
nread_elements = 0; nread_elements = infile1.gcount();
} }
nsamples += (nread_elements / 2); nsamples += (nread_elements / 2);
@ -442,7 +444,7 @@ void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const
} }
else else
{ {
nread_elements = 0; nread_elements = infile1.gcount();
} }
nsamples += (nread_elements / 2); nsamples += (nread_elements / 2);
@ -474,7 +476,7 @@ void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const
} }
else else
{ {
nread_elements = 0; nread_elements = infile1.gcount();
} }
try try
{ {
@ -490,7 +492,7 @@ void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const
} }
else else
{ {
nread_elements2 = 0; nread_elements2 = infile2.gcount();
} }
if (nread_elements > nread_elements2) if (nread_elements > nread_elements2)
@ -551,12 +553,22 @@ void Ad9361FpgaSignalSource::run_DMA_process(const std::string &FreqBand, const
{ {
file_completed = 1; file_completed = 1;
} }
std::unique_lock<std::mutex> lock(dma_mutex);
if (enable_DMA_ == false)
{
file_completed = true;
}
lock.unlock();
} }
try try
{ {
infile1.close(); infile1.close();
infile2.close(); if (FreqBand == "L1L2")
{
infile2.close();
}
} }
catch (const std::ifstream::failure &e) catch (const std::ifstream::failure &e)
{ {

6
src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
View File

@ -27,6 +27,7 @@
#include <pmt/pmt.h> #include <pmt/pmt.h>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <mutex>
#include <string> #include <string>
#include <thread> #include <thread>
@ -67,8 +68,7 @@ public:
private: private:
void run_DMA_process(const std::string &FreqBand, void run_DMA_process(const std::string &FreqBand,
const std::string &Filename1, const std::string &Filename1,
const std::string &Filename2, const std::string &Filename2);
bool enable_DMA);
std::thread thread_file_to_dma; std::thread thread_file_to_dma;
@ -116,6 +116,8 @@ private:
bool rx2_enable_; bool rx2_enable_;
bool enable_DMA_; bool enable_DMA_;
bool rf_shutdown_; bool rf_shutdown_;
std::mutex dma_mutex;
}; };
#endif // GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H #endif // GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H