aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2021-07-17 15:17:07 +0200
committermormj <34754695+mormj@users.noreply.github.com>2021-08-02 07:02:37 -0400
commit60580c0f485aa6790bc8d19c5d76bd3fc0e3d0cc (patch)
tree92a7f2f7c6fa55b2911ee314fdd4796e51d83545
parentruntime: remove tag_checker (diff)
downloadgnuradio-60580c0f485aa6790bc8d19c5d76bd3fc0e3d0cc.tar.xz
gnuradio-60580c0f485aa6790bc8d19c5d76bd3fc0e3d0cc.zip
iio: Remove struct specifier (not necessary in C++, clutters a bit)
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
-rw-r--r--gr-iio/include/gnuradio/iio/device_sink.h2
-rw-r--r--gr-iio/include/gnuradio/iio/device_source.h2
-rw-r--r--gr-iio/include/gnuradio/iio/fmcomms5_sink.h2
-rw-r--r--gr-iio/include/gnuradio/iio/fmcomms5_source.h2
-rw-r--r--gr-iio/lib/attr_sink_impl.h6
-rw-r--r--gr-iio/lib/attr_source_impl.h6
-rw-r--r--gr-iio/lib/dds_control_impl.cc6
-rw-r--r--gr-iio/lib/dds_control_impl.h4
-rw-r--r--gr-iio/lib/device_sink_impl.cc12
-rw-r--r--gr-iio/lib/device_sink_impl.h12
-rw-r--r--gr-iio/lib/device_source_impl.cc29
-rw-r--r--gr-iio/lib/device_source_impl.h25
-rw-r--r--gr-iio/lib/fmcomms2_sink_impl.cc2
-rw-r--r--gr-iio/lib/fmcomms2_sink_impl.h2
-rw-r--r--gr-iio/lib/fmcomms2_source_impl.cc2
-rw-r--r--gr-iio/lib/fmcomms2_source_impl.h2
-rw-r--r--gr-iio/lib/fmcomms5_sink_impl.cc6
-rw-r--r--gr-iio/lib/fmcomms5_sink_impl.h6
-rw-r--r--gr-iio/lib/fmcomms5_source_impl.cc6
-rw-r--r--gr-iio/lib/fmcomms5_source_impl.h6
-rw-r--r--gr-iio/lib/pluto_source_impl.cc4
-rw-r--r--gr-iio/python/iio/bindings/device_sink_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/device_source_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/fmcomms2_sink_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/fmcomms2_source_f32c_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/fmcomms2_source_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/fmcomms5_sink_f32c_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/fmcomms5_sink_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/fmcomms5_source_f32c_python.cc2
-rw-r--r--gr-iio/python/iio/bindings/fmcomms5_source_python.cc2
30 files changed, 78 insertions, 84 deletions
diff --git a/gr-iio/include/gnuradio/iio/device_sink.h b/gr-iio/include/gnuradio/iio/device_sink.h
index 10d02a68a..bf9d5f1d9 100644
--- a/gr-iio/include/gnuradio/iio/device_sink.h
+++ b/gr-iio/include/gnuradio/iio/device_sink.h
@@ -65,7 +65,7 @@ public:
unsigned int interpolation = 0,
bool cyclic = false);
- static sptr make_from(struct iio_context* ctx,
+ static sptr make_from(iio_context* ctx,
const std::string& device,
const std::vector<std::string>& channels,
const std::string& device_phy,
diff --git a/gr-iio/include/gnuradio/iio/device_source.h b/gr-iio/include/gnuradio/iio/device_source.h
index b493eccb0..aa18e3fdc 100644
--- a/gr-iio/include/gnuradio/iio/device_source.h
+++ b/gr-iio/include/gnuradio/iio/device_source.h
@@ -59,7 +59,7 @@ public:
unsigned int buffer_size = DEFAULT_BUFFER_SIZE,
unsigned int decimation = 0);
- static sptr make_from(struct iio_context* ctx,
+ static sptr make_from(iio_context* ctx,
const std::string& device,
const std::vector<std::string>& channels,
const std::string& device_phy,
diff --git a/gr-iio/include/gnuradio/iio/fmcomms5_sink.h b/gr-iio/include/gnuradio/iio/fmcomms5_sink.h
index 93905a557..7db795c0b 100644
--- a/gr-iio/include/gnuradio/iio/fmcomms5_sink.h
+++ b/gr-iio/include/gnuradio/iio/fmcomms5_sink.h
@@ -97,7 +97,7 @@ public:
float Fpass = 0.0,
float Fstop = 0.0);
- static sptr make_from(struct iio_context* ctx,
+ static sptr make_from(iio_context* ctx,
unsigned long long frequency1,
unsigned long long frequency2,
unsigned long samplerate,
diff --git a/gr-iio/include/gnuradio/iio/fmcomms5_source.h b/gr-iio/include/gnuradio/iio/fmcomms5_source.h
index eea19e563..0bcac4d64 100644
--- a/gr-iio/include/gnuradio/iio/fmcomms5_source.h
+++ b/gr-iio/include/gnuradio/iio/fmcomms5_source.h
@@ -135,7 +135,7 @@ public:
float Fpass = 0.0,
float Fstop = 0.0);
- static sptr make_from(struct iio_context* ctx,
+ static sptr make_from(iio_context* ctx,
unsigned long long frequency1,
unsigned long long frequency2,
unsigned long samplerate,
diff --git a/gr-iio/lib/attr_sink_impl.h b/gr-iio/lib/attr_sink_impl.h
index af91a34c2..8fa2da7cd 100644
--- a/gr-iio/lib/attr_sink_impl.h
+++ b/gr-iio/lib/attr_sink_impl.h
@@ -30,9 +30,9 @@ private:
bool output;
protected:
- struct iio_context* ctx;
- struct iio_device* dev;
- struct iio_channel* chan;
+ iio_context* ctx;
+ iio_device* dev;
+ iio_channel* chan;
public:
attr_sink_impl(const std::string& uri,
diff --git a/gr-iio/lib/attr_source_impl.h b/gr-iio/lib/attr_source_impl.h
index 5f2b965b9..f4b4e4033 100644
--- a/gr-iio/lib/attr_source_impl.h
+++ b/gr-iio/lib/attr_source_impl.h
@@ -34,9 +34,9 @@ private:
uint32_t address;
protected:
- struct iio_context* ctx;
- struct iio_device* dev;
- struct iio_channel* chan;
+ iio_context* ctx;
+ iio_device* dev;
+ iio_channel* chan;
public:
attr_source_impl(const std::string& uri,
diff --git a/gr-iio/lib/dds_control_impl.cc b/gr-iio/lib/dds_control_impl.cc
index 8608ca15a..3d0defd17 100644
--- a/gr-iio/lib/dds_control_impl.cc
+++ b/gr-iio/lib/dds_control_impl.cc
@@ -51,14 +51,14 @@ dds_control_impl::dds_control_impl(const std::string& uri,
{
int k, chans;
unsigned int ku = 0, count = 0;
- struct iio_channel* chan;
+ iio_channel* chan;
d_ctx = device_source_impl::get_context(uri);
if (!d_ctx)
throw std::runtime_error("Unable to create context");
int d = iio_context_get_devices_count(d_ctx);
- struct iio_device* dev;
+ iio_device* dev;
const char* name;
// Find dds device
for (k = 0; k < d; k++) {
@@ -95,7 +95,7 @@ void dds_control_impl::set_dds_confg(std::vector<long> frequencies,
{
int ret, chans, k, dds_indx = 0, enable_indx = 0, enable = 0;
unsigned int ku;
- struct iio_channel* chan;
+ iio_channel* chan;
// Check vector sizes
if ((frequencies.size() != phases.size()) || (phases.size() != scales.size()))
diff --git a/gr-iio/lib/dds_control_impl.h b/gr-iio/lib/dds_control_impl.h
index 03f19fb79..9b5eb15d5 100644
--- a/gr-iio/lib/dds_control_impl.h
+++ b/gr-iio/lib/dds_control_impl.h
@@ -31,8 +31,8 @@ private:
std::string d_uri;
protected:
- struct iio_context* d_ctx;
- struct iio_device* d_dev;
+ iio_context* d_ctx;
+ iio_device* d_dev;
public:
dds_control_impl(const std::string& uri,
diff --git a/gr-iio/lib/device_sink_impl.cc b/gr-iio/lib/device_sink_impl.cc
index 442fcae4c..dc4a360bf 100644
--- a/gr-iio/lib/device_sink_impl.cc
+++ b/gr-iio/lib/device_sink_impl.cc
@@ -44,7 +44,7 @@ device_sink::sptr device_sink::make(const std::string& uri,
cyclic));
}
-device_sink::sptr device_sink::make_from(struct iio_context* ctx,
+device_sink::sptr device_sink::make_from(iio_context* ctx,
const std::string& device,
const std::vector<std::string>& channels,
const std::string& device_phy,
@@ -72,7 +72,7 @@ void device_sink_impl::set_params(const std::vector<std::string>& params)
/*
* The private constructor
*/
-device_sink_impl::device_sink_impl(struct iio_context* ctx,
+device_sink_impl::device_sink_impl(iio_context* ctx,
bool destroy_ctx,
const std::string& device,
const std::vector<std::string>& channels,
@@ -114,7 +114,7 @@ device_sink_impl::device_sink_impl(struct iio_context* ctx,
if (channels.empty()) {
for (i = 0; i < nb_channels; i++) {
- struct iio_channel* chn = iio_device_get_channel(dev, i);
+ iio_channel* chn = iio_device_get_channel(dev, i);
iio_channel_enable(chn);
channel_list.push_back(chn);
@@ -123,7 +123,7 @@ device_sink_impl::device_sink_impl(struct iio_context* ctx,
for (std::vector<std::string>::const_iterator it = channels.begin();
it != channels.end();
++it) {
- struct iio_channel* chn = iio_device_find_channel(dev, it->c_str(), true);
+ iio_channel* chn = iio_device_find_channel(dev, it->c_str(), true);
if (!chn) {
if (destroy_ctx)
iio_context_destroy(ctx);
@@ -153,9 +153,7 @@ device_sink_impl::~device_sink_impl()
device_source_impl::remove_ctx_history(ctx, destroy_ctx);
}
-void device_sink_impl::channel_write(const struct iio_channel* chn,
- const void* src,
- size_t len)
+void device_sink_impl::channel_write(const iio_channel* chn, const void* src, size_t len)
{
uintptr_t dst_ptr, src_ptr = (uintptr_t)src, end = src_ptr + len;
unsigned int length = iio_channel_get_data_format(chn)->length / 8;
diff --git a/gr-iio/lib/device_sink_impl.h b/gr-iio/lib/device_sink_impl.h
index 836d75698..fdea63ae9 100644
--- a/gr-iio/lib/device_sink_impl.h
+++ b/gr-iio/lib/device_sink_impl.h
@@ -22,21 +22,21 @@ namespace iio {
class device_sink_impl : public device_sink
{
private:
- void channel_write(const struct iio_channel* chn, const void* src, size_t len);
+ void channel_write(const iio_channel* chn, const void* src, size_t len);
std::vector<tag_t> d_tags;
protected:
- struct iio_context* ctx;
- struct iio_device *dev, *phy;
- struct iio_buffer* buf;
- std::vector<struct iio_channel*> channel_list;
+ iio_context* ctx;
+ iio_device *dev, *phy;
+ iio_buffer* buf;
+ std::vector<iio_channel*> channel_list;
unsigned int interpolation;
unsigned int buffer_size;
bool destroy_ctx;
pmt::pmt_t d_len_tag_key;
public:
- device_sink_impl(struct iio_context* ctx,
+ device_sink_impl(iio_context* ctx,
bool destroy_ctx,
const std::string& device,
const std::vector<std::string>& channels,
diff --git a/gr-iio/lib/device_source_impl.cc b/gr-iio/lib/device_source_impl.cc
index d837a06eb..87ae3c1a2 100644
--- a/gr-iio/lib/device_source_impl.cc
+++ b/gr-iio/lib/device_source_impl.cc
@@ -44,7 +44,7 @@ device_source::sptr device_source::make(const std::string& uri,
decimation));
}
-device_source::sptr device_source::make_from(struct iio_context* ctx,
+device_source::sptr device_source::make_from(iio_context* ctx,
const std::string& device,
const std::vector<std::string>& channels,
const std::string& device_phy,
@@ -56,14 +56,14 @@ device_source::sptr device_source::make_from(struct iio_context* ctx,
ctx, false, device, channels, device_phy, params, buffer_size, decimation));
}
-void device_source_impl::set_params(struct iio_device* phy,
+void device_source_impl::set_params(iio_device* phy,
const std::vector<std::string>& params)
{
static GR_LOG_GET_CONFIGURED_LOGGER(logger, "iio::device::set_params");
for (std::vector<std::string>::const_iterator it = params.begin(); it != params.end();
++it) {
- struct iio_channel* chn = NULL;
+ iio_channel* chn = NULL;
const char* attr = NULL;
size_t pos;
int ret;
@@ -132,9 +132,9 @@ void device_source_impl::set_timeout_ms(unsigned long _timeout)
this->timeout = _timeout;
}
-struct iio_context* device_source_impl::get_context(const std::string& uri)
+iio_context* device_source_impl::get_context(const std::string& uri)
{
- struct iio_context* ctx;
+ iio_context* ctx;
// Check if we have a context with the same URI open
if (!contexts.empty()) {
@@ -168,7 +168,7 @@ struct iio_context* device_source_impl::get_context(const std::string& uri)
/*
* The private constructor
*/
-device_source_impl::device_source_impl(struct iio_context* ctx,
+device_source_impl::device_source_impl(iio_context* ctx,
bool destroy_ctx,
const std::string& device,
const std::vector<std::string>& channels,
@@ -208,7 +208,7 @@ device_source_impl::device_source_impl(struct iio_context* ctx,
if (channels.empty()) {
for (i = 0; i < nb_channels; i++) {
- struct iio_channel* chn = iio_device_get_channel(dev, i);
+ iio_channel* chn = iio_device_get_channel(dev, i);
iio_channel_enable(chn);
channel_list.push_back(chn);
@@ -217,7 +217,7 @@ device_source_impl::device_source_impl(struct iio_context* ctx,
for (std::vector<std::string>::const_iterator it = channels.begin();
it != channels.end();
++it) {
- struct iio_channel* chn = iio_device_find_channel(dev, it->c_str(), false);
+ iio_channel* chn = iio_device_find_channel(dev, it->c_str(), false);
if (!chn) {
if (destroy_ctx)
iio_context_destroy(ctx);
@@ -235,8 +235,7 @@ device_source_impl::device_source_impl(struct iio_context* ctx,
message_port_register_out(port_id);
}
-void device_source_impl::remove_ctx_history(struct iio_context* ctx_from_block,
- bool destroy_ctx)
+void device_source_impl::remove_ctx_history(iio_context* ctx_from_block, bool destroy_ctx)
{
std::lock_guard<std::mutex> lock(ctx_mutex);
@@ -264,9 +263,7 @@ device_source_impl::~device_source_impl()
remove_ctx_history(ctx, destroy_ctx);
}
-void device_source_impl::channel_read(const struct iio_channel* chn,
- void* dst,
- size_t len)
+void device_source_impl::channel_read(const iio_channel* chn, void* dst, size_t len)
{
uintptr_t src_ptr, dst_ptr = (uintptr_t)dst, end = dst_ptr + len;
unsigned int length = iio_channel_get_data_format(chn)->length / 8;
@@ -358,7 +355,7 @@ bool device_source_impl::stop()
return true;
}
-bool device_source_impl::load_fir_filter(std::string& filter, struct iio_device* phy)
+bool device_source_impl::load_fir_filter(std::string& filter, iio_device* phy)
{
if (filter.empty() || !iio_device_find_attr(phy, "filter_fir_config"))
return false;
@@ -398,12 +395,12 @@ bool device_source_impl::load_fir_filter(std::string& filter, struct iio_device*
int device_source_impl::handle_decimation_interpolation(unsigned long samplerate,
const char* channel_name,
const char* attr_name,
- struct iio_device* dev,
+ iio_device* dev,
bool disable_dec,
bool output_chan)
{
int ret;
- struct iio_channel* chan;
+ iio_channel* chan;
char buff[128];
unsigned long long min, max;
diff --git a/gr-iio/lib/device_source_impl.h b/gr-iio/lib/device_source_impl.h
index 386a1ed7c..6bcacbe91 100644
--- a/gr-iio/lib/device_source_impl.h
+++ b/gr-iio/lib/device_source_impl.h
@@ -24,7 +24,7 @@ namespace iio {
struct ctxInfo {
std::string uri;
- struct iio_context* ctx;
+ iio_context* ctx;
int count;
};
@@ -36,7 +36,7 @@ typedef std::vector<ctxInfo>::iterator ctx_it;
class device_source_impl : public device_source
{
private:
- void channel_read(const struct iio_channel* chn, void* dst, size_t len);
+ void channel_read(const iio_channel* chn, void* dst, size_t len);
/*std::condition_variable iio_cond, iio_cond2;*/
std::mutex iio_mutex;
@@ -54,10 +54,10 @@ private:
void refill_thread();
protected:
- struct iio_context* ctx;
- struct iio_device *dev, *phy;
- struct iio_buffer* buf;
- std::vector<struct iio_channel*> channel_list;
+ iio_context* ctx;
+ iio_device *dev, *phy;
+ iio_buffer* buf;
+ std::vector<iio_channel*> channel_list;
unsigned int buffer_size;
unsigned int decimation;
bool destroy_ctx;
@@ -65,7 +65,7 @@ protected:
public:
- device_source_impl(struct iio_context* ctx,
+ device_source_impl(iio_context* ctx,
bool destroy_ctx,
const std::string& device,
const std::vector<std::string>& channels,
@@ -76,8 +76,7 @@ public:
~device_source_impl();
- static void set_params(struct iio_device* phy,
- const std::vector<std::string>& params);
+ static void set_params(iio_device* phy, const std::vector<std::string>& params);
void set_len_tag_key(const std::string& len_tag_key) override;
@@ -93,14 +92,14 @@ public:
bool start();
bool stop();
- static void remove_ctx_history(struct iio_context* ctx, bool destroy_ctx);
+ static void remove_ctx_history(iio_context* ctx, bool destroy_ctx);
- static struct iio_context* get_context(const std::string& uri);
- static bool load_fir_filter(std::string& filter, struct iio_device* phy);
+ static iio_context* get_context(const std::string& uri);
+ static bool load_fir_filter(std::string& filter, iio_device* phy);
static int handle_decimation_interpolation(unsigned long samplerate,
const char* channel_name,
const char* attr_name,
- struct iio_device* dev,
+ iio_device* dev,
bool disable_dec,
bool output_chan);
};
diff --git a/gr-iio/lib/fmcomms2_sink_impl.cc b/gr-iio/lib/fmcomms2_sink_impl.cc
index ceaaf2505..417816d9e 100644
--- a/gr-iio/lib/fmcomms2_sink_impl.cc
+++ b/gr-iio/lib/fmcomms2_sink_impl.cc
@@ -70,7 +70,7 @@ fmcomms2_sink_impl::get_channels_vector(const std::vector<bool>& ch_en)
}
-fmcomms2_sink_impl::fmcomms2_sink_impl(struct iio_context* ctx,
+fmcomms2_sink_impl::fmcomms2_sink_impl(iio_context* ctx,
const std::vector<bool>& ch_en,
unsigned long buffer_size,
bool cyclic)
diff --git a/gr-iio/lib/fmcomms2_sink_impl.h b/gr-iio/lib/fmcomms2_sink_impl.h
index 610be0762..98aff1145 100644
--- a/gr-iio/lib/fmcomms2_sink_impl.h
+++ b/gr-iio/lib/fmcomms2_sink_impl.h
@@ -35,7 +35,7 @@ private:
void check_underflow(void);
public:
- fmcomms2_sink_impl(struct iio_context* ctx,
+ fmcomms2_sink_impl(iio_context* ctx,
const std::vector<bool>& ch_en,
unsigned long buffer_size,
bool cyclic);
diff --git a/gr-iio/lib/fmcomms2_source_impl.cc b/gr-iio/lib/fmcomms2_source_impl.cc
index 934206e5f..e102e9924 100644
--- a/gr-iio/lib/fmcomms2_source_impl.cc
+++ b/gr-iio/lib/fmcomms2_source_impl.cc
@@ -67,7 +67,7 @@ fmcomms2_source_impl::get_channels_vector(const std::vector<bool>& ch_en)
}
-fmcomms2_source_impl::fmcomms2_source_impl(struct iio_context* ctx,
+fmcomms2_source_impl::fmcomms2_source_impl(iio_context* ctx,
const std::vector<bool>& ch_en,
unsigned long buffer_size)
: gr::sync_block("fmcomms2_source",
diff --git a/gr-iio/lib/fmcomms2_source_impl.h b/gr-iio/lib/fmcomms2_source_impl.h
index 45a498f65..ebad428de 100644
--- a/gr-iio/lib/fmcomms2_source_impl.h
+++ b/gr-iio/lib/fmcomms2_source_impl.h
@@ -30,7 +30,7 @@ private:
void check_overflow(void);
public:
- fmcomms2_source_impl(struct iio_context* ctx,
+ fmcomms2_source_impl(iio_context* ctx,
const std::vector<bool>& ch_en,
unsigned long buffer_size);
diff --git a/gr-iio/lib/fmcomms5_sink_impl.cc b/gr-iio/lib/fmcomms5_sink_impl.cc
index b4afc06ae..e6126e237 100644
--- a/gr-iio/lib/fmcomms5_sink_impl.cc
+++ b/gr-iio/lib/fmcomms5_sink_impl.cc
@@ -105,7 +105,7 @@ fmcomms5_sink::sptr fmcomms5_sink::make(const std::string& uri,
Fstop));
}
-fmcomms5_sink::sptr fmcomms5_sink::make_from(struct iio_context* ctx,
+fmcomms5_sink::sptr fmcomms5_sink::make_from(iio_context* ctx,
unsigned long long frequency1,
unsigned long long frequency2,
unsigned long samplerate,
@@ -186,7 +186,7 @@ std::vector<std::string> fmcomms5_sink_impl::get_channels_vector(bool ch1_en,
return channels;
}
-fmcomms5_sink_impl::fmcomms5_sink_impl(struct iio_context* ctx,
+fmcomms5_sink_impl::fmcomms5_sink_impl(iio_context* ctx,
bool destroy_ctx,
unsigned long long frequency1,
unsigned long long frequency2,
@@ -247,7 +247,7 @@ fmcomms5_sink_impl::fmcomms5_sink_impl(struct iio_context* ctx,
Fstop);
}
-void fmcomms5_sink_impl::set_params(struct iio_device* phy_device,
+void fmcomms5_sink_impl::set_params(iio_device* phy_device,
unsigned long long frequency,
unsigned long samplerate,
unsigned long bandwidth,
diff --git a/gr-iio/lib/fmcomms5_sink_impl.h b/gr-iio/lib/fmcomms5_sink_impl.h
index 8919a6259..25e443fc5 100644
--- a/gr-iio/lib/fmcomms5_sink_impl.h
+++ b/gr-iio/lib/fmcomms5_sink_impl.h
@@ -24,9 +24,9 @@ class fmcomms5_sink_impl : public fmcomms5_sink, public device_sink_impl
private:
bool cyclic;
unsigned long samplerate;
- struct iio_device* phy2;
+ iio_device* phy2;
- static void set_params(struct iio_device* phy_device,
+ static void set_params(iio_device* phy_device,
unsigned long long frequency,
unsigned long samplerate,
unsigned long bandwidth,
@@ -48,7 +48,7 @@ private:
bool ch8_en);
public:
- fmcomms5_sink_impl(struct iio_context* ctx,
+ fmcomms5_sink_impl(iio_context* ctx,
bool destroy_ctx,
unsigned long long frequency1,
unsigned long long frequency2,
diff --git a/gr-iio/lib/fmcomms5_source_impl.cc b/gr-iio/lib/fmcomms5_source_impl.cc
index c25c89c86..ef8908d7d 100644
--- a/gr-iio/lib/fmcomms5_source_impl.cc
+++ b/gr-iio/lib/fmcomms5_source_impl.cc
@@ -116,7 +116,7 @@ fmcomms5_source::sptr fmcomms5_source::make(const std::string& uri,
Fstop));
}
-fmcomms5_source::sptr fmcomms5_source::make_from(struct iio_context* ctx,
+fmcomms5_source::sptr fmcomms5_source::make_from(iio_context* ctx,
unsigned long long frequency1,
unsigned long long frequency2,
unsigned long samplerate,
@@ -209,7 +209,7 @@ std::vector<std::string> fmcomms5_source_impl::get_channels_vector(bool ch1_en,
return channels;
}
-fmcomms5_source_impl::fmcomms5_source_impl(struct iio_context* ctx,
+fmcomms5_source_impl::fmcomms5_source_impl(iio_context* ctx,
bool destroy_ctx,
unsigned long long frequency1,
unsigned long long frequency2,
@@ -281,7 +281,7 @@ fmcomms5_source_impl::fmcomms5_source_impl(struct iio_context* ctx,
Fstop);
}
-void fmcomms5_source_impl::set_params(struct iio_device* phy_device,
+void fmcomms5_source_impl::set_params(iio_device* phy_device,
unsigned long long frequency,
unsigned long samplerate,
unsigned long bandwidth,
diff --git a/gr-iio/lib/fmcomms5_source_impl.h b/gr-iio/lib/fmcomms5_source_impl.h
index f853928e3..2f008c233 100644
--- a/gr-iio/lib/fmcomms5_source_impl.h
+++ b/gr-iio/lib/fmcomms5_source_impl.h
@@ -23,9 +23,9 @@ class fmcomms5_source_impl : public fmcomms5_source, public device_source_impl
{
private:
unsigned long samplerate;
- struct iio_device* phy2;
+ iio_device* phy2;
- static void set_params(struct iio_device* phy_device,
+ static void set_params(iio_device* phy_device,
unsigned long long frequency,
unsigned long samplerate,
unsigned long bandwidth,
@@ -52,7 +52,7 @@ private:
bool ch8_en);
public:
- fmcomms5_source_impl(struct iio_context* ctx,
+ fmcomms5_source_impl(iio_context* ctx,
bool destroy_ctx,
unsigned long long frequency1,
unsigned long long frequency2,
diff --git a/gr-iio/lib/pluto_source_impl.cc b/gr-iio/lib/pluto_source_impl.cc
index 216cb6552..00e81273a 100644
--- a/gr-iio/lib/pluto_source_impl.cc
+++ b/gr-iio/lib/pluto_source_impl.cc
@@ -27,11 +27,11 @@ pluto_source::sptr pluto_source::make(const std::string& uri, unsigned long buff
std::string pluto_source_impl::get_uri()
{
- struct iio_scan_context* ctx = iio_create_scan_context("usb", 0);
+ iio_scan_context* ctx = iio_create_scan_context("usb", 0);
if (!ctx)
throw std::runtime_error("Unable to create scan context");
- struct iio_context_info** info;
+ iio_context_info** info;
int ret = iio_scan_context_get_info_list(ctx, &info);
if (ret < 0) {
iio_scan_context_destroy(ctx);
diff --git a/gr-iio/python/iio/bindings/device_sink_python.cc b/gr-iio/python/iio/bindings/device_sink_python.cc
index 9070bd409..f3cadc623 100644
--- a/gr-iio/python/iio/bindings/device_sink_python.cc
+++ b/gr-iio/python/iio/bindings/device_sink_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(device_sink.h) */
-/* BINDTOOL_HEADER_FILE_HASH(cc567f6efacc47c8e6dd89985dd33c3f) */
+/* BINDTOOL_HEADER_FILE_HASH(955a5cf5cd09be457c60c8ce2dfe96d8) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/device_source_python.cc b/gr-iio/python/iio/bindings/device_source_python.cc
index c34f328ba..4219aac92 100644
--- a/gr-iio/python/iio/bindings/device_source_python.cc
+++ b/gr-iio/python/iio/bindings/device_source_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(device_source.h) */
-/* BINDTOOL_HEADER_FILE_HASH(b7f9efa65ce300b5fd707cfb59d62529) */
+/* BINDTOOL_HEADER_FILE_HASH(d959417ab79d21ca10ef0b9f6161d116) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc b/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc
index 53168eff1..2c98a0c8c 100644
--- a/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc
+++ b/gr-iio/python/iio/bindings/fmcomms2_sink_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(fmcomms2_sink.h) */
-/* BINDTOOL_HEADER_FILE_HASH(8d538776355ec633d4c0e70b075af87d) */
+/* BINDTOOL_HEADER_FILE_HASH(1ca54fa74c12834cae56b0832dd5c3f3) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/fmcomms2_source_f32c_python.cc b/gr-iio/python/iio/bindings/fmcomms2_source_f32c_python.cc
index 82a338cdd..57a0ce0cf 100644
--- a/gr-iio/python/iio/bindings/fmcomms2_source_f32c_python.cc
+++ b/gr-iio/python/iio/bindings/fmcomms2_source_f32c_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(fmcomms2_source_fc32.h) */
-/* BINDTOOL_HEADER_FILE_HASH(ac7fd629916d34fa7785ef97b2d1d1ef) */
+/* BINDTOOL_HEADER_FILE_HASH(dde70331e3284513f54d0d26df960535) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/fmcomms2_source_python.cc b/gr-iio/python/iio/bindings/fmcomms2_source_python.cc
index 86ad9b786..636c4127d 100644
--- a/gr-iio/python/iio/bindings/fmcomms2_source_python.cc
+++ b/gr-iio/python/iio/bindings/fmcomms2_source_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(fmcomms2_source.h) */
-/* BINDTOOL_HEADER_FILE_HASH(d42f0dcf19e3ece400da638d3d95e61c) */
+/* BINDTOOL_HEADER_FILE_HASH(79999a9f1335aa4bc5043ddf033a0e38) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/fmcomms5_sink_f32c_python.cc b/gr-iio/python/iio/bindings/fmcomms5_sink_f32c_python.cc
index eaabe7a87..925a8ad20 100644
--- a/gr-iio/python/iio/bindings/fmcomms5_sink_f32c_python.cc
+++ b/gr-iio/python/iio/bindings/fmcomms5_sink_f32c_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(fmcomms5_sink.h) */
-/* BINDTOOL_HEADER_FILE_HASH(86b4898504a92fd7f157a4cde608c4f1) */
+/* BINDTOOL_HEADER_FILE_HASH(21d1c8134dce260caa1564aaaff30d09) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/fmcomms5_sink_python.cc b/gr-iio/python/iio/bindings/fmcomms5_sink_python.cc
index 088116a43..df9bb600f 100644
--- a/gr-iio/python/iio/bindings/fmcomms5_sink_python.cc
+++ b/gr-iio/python/iio/bindings/fmcomms5_sink_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(fmcomms5_sink.h) */
-/* BINDTOOL_HEADER_FILE_HASH(86b4898504a92fd7f157a4cde608c4f1) */
+/* BINDTOOL_HEADER_FILE_HASH(21d1c8134dce260caa1564aaaff30d09) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/fmcomms5_source_f32c_python.cc b/gr-iio/python/iio/bindings/fmcomms5_source_f32c_python.cc
index 5b9f71964..95816d4f3 100644
--- a/gr-iio/python/iio/bindings/fmcomms5_source_f32c_python.cc
+++ b/gr-iio/python/iio/bindings/fmcomms5_source_f32c_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(fmcomms5_source.h) */
-/* BINDTOOL_HEADER_FILE_HASH(c665df9240c9c1460e51d3678c16deb5) */
+/* BINDTOOL_HEADER_FILE_HASH(6db6b174251b0437df60bd5d117bc5ee) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-iio/python/iio/bindings/fmcomms5_source_python.cc b/gr-iio/python/iio/bindings/fmcomms5_source_python.cc
index fa86b878c..dfb172d36 100644
--- a/gr-iio/python/iio/bindings/fmcomms5_source_python.cc
+++ b/gr-iio/python/iio/bindings/fmcomms5_source_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(fmcomms5_source.h) */
-/* BINDTOOL_HEADER_FILE_HASH(c665df9240c9c1460e51d3678c16deb5) */
+/* BINDTOOL_HEADER_FILE_HASH(6db6b174251b0437df60bd5d117bc5ee) */
/***********************************************************************************/
#include <pybind11/complex.h>