From 0e6364af5afa745eb70d77f66f83dd70d85d981a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 23 Sep 2019 14:25:03 +0200
Subject: [PATCH 1/3] Remove unused variables
---
.../adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc | 1 -
.../acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc | 1 -
.../acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc | 3 ---
3 files changed, 5 deletions(-)
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
index 7712035ce..75d217e8f 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
@@ -54,7 +54,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
pcpsconf_fpga_t acq_parameters;
configuration_ = configuration;
- std::string default_item_type = "cshort";
std::string default_dump_filename = "./data/acquisition.dat";
DLOG(INFO) << "role " << role;
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc
index 774bfac2a..9775dd08d 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc
@@ -56,7 +56,6 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
{
pcpsconf_fpga_t acq_parameters;
configuration_ = configuration;
- std::string default_item_type = "cshort";
DLOG(INFO) << "role " << role;
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
index a94c8cf53..daf8c20d5 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
@@ -56,13 +56,10 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
{
pcpsconf_fpga_t acq_parameters;
configuration_ = configuration;
- std::string default_item_type = "gr_complex";
std::string default_dump_filename = "./acquisition.mat";
LOG(INFO) << "role " << role;
- item_type_ = configuration_->property(role + ".item_type", default_item_type);
-
int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
acq_parameters.fs_in = fs_in_;
From 4dc30da649526a9010046b7da2d5daa6562e328f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 23 Sep 2019 14:34:44 +0200
Subject: [PATCH 2/3] Remove unused variables
---
.../signal_source/adapters/ad9361_fpga_signal_source.cc | 2 --
.../signal_source/adapters/ad9361_fpga_signal_source.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
index 1e9485b3d..f63a1ba81 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
@@ -46,7 +46,6 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
const std::string& role, unsigned int in_stream, unsigned int out_stream,
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
{
- std::string default_item_type = "gr_complex";
std::string default_dump_file = "./data/signal_source.dat";
freq_ = configuration->property(role + ".freq", GPS_L1_FREQ_HZ);
sample_rate_ = configuration->property(role + ".sampling_frequency", 12500000);
@@ -64,7 +63,6 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
rf_port_select_ = configuration->property(role + ".rf_port_select", std::string("A_BALANCED"));
filter_file_ = configuration->property(role + ".filter_file", std::string(""));
filter_auto_ = configuration->property(role + ".filter_auto", true);
- item_type_ = configuration->property(role + ".item_type", default_item_type);
samples_ = configuration->property(role + ".samples", 0);
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
index afc496224..114351788 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
@@ -108,7 +108,6 @@ private:
uint32_t in_stream_;
uint32_t out_stream_;
- std::string item_type_;
size_t item_size_;
long samples_;
bool dump_;
From 54661af0a479094c3dc4cc92a52f80f8e56ee6b2 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 23 Sep 2019 14:36:09 +0200
Subject: [PATCH 3/3] Fix compilation in macOS when ENABLE_AD9361=ON
---
src/algorithms/signal_source/libs/fpga_switch.cc | 4 ++--
src/algorithms/signal_source/libs/fpga_switch.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/algorithms/signal_source/libs/fpga_switch.cc b/src/algorithms/signal_source/libs/fpga_switch.cc
index c291b0c48..e61fb934e 100644
--- a/src/algorithms/signal_source/libs/fpga_switch.cc
+++ b/src/algorithms/signal_source/libs/fpga_switch.cc
@@ -46,7 +46,7 @@ Fpga_Switch::Fpga_Switch(const std::string &device_name)
{
LOG(WARNING) << "Cannot open deviceio" << device_name;
}
- d_map_base = reinterpret_cast<volatile unsigned *>(mmap(nullptr, PAGE_SIZE,
+ d_map_base = reinterpret_cast<volatile unsigned *>(mmap(nullptr, FPGA_PAGE_SIZE,
PROT_READ | PROT_WRITE, MAP_SHARED, d_device_descriptor, 0));
if (d_map_base == reinterpret_cast<void *>(-1))
@@ -104,7 +104,7 @@ unsigned Fpga_Switch::fpga_switch_test_register(
void Fpga_Switch::close_device()
{
auto *aux = const_cast<unsigned *>(d_map_base);
- if (munmap(static_cast<void *>(aux), PAGE_SIZE) == -1)
+ if (munmap(static_cast<void *>(aux), FPGA_PAGE_SIZE) == -1)
{
std::cout << "Failed to unmap memory uio" << std::endl;
}
diff --git a/src/algorithms/signal_source/libs/fpga_switch.h b/src/algorithms/signal_source/libs/fpga_switch.h
index e929c187f..442c97a1a 100644
--- a/src/algorithms/signal_source/libs/fpga_switch.h
+++ b/src/algorithms/signal_source/libs/fpga_switch.h
@@ -62,7 +62,7 @@ public:
void set_switch_position(int32_t switch_position);
private:
- static const size_t PAGE_SIZE = 0x10000;
+ static const size_t FPGA_PAGE_SIZE = 0x10000;
static const uint32_t TEST_REGISTER_TRACK_WRITEVAL = 0x55AA;
static const uint32_t MAX_LENGTH_DEVICEIO_NAME = 50;