summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Morman <jmorman@peratonlabs.com>2021-10-11 14:35:36 -0400
committermormj <34754695+mormj@users.noreply.github.com>2021-10-13 12:03:15 -0400
commit76700a84d68fb41873168ea0e55b6832acd4efa7 (patch)
tree9b937a430a4c78cbba152669cf1943f00fc5c399
parent973a2da868e9a2fb71308e8e7dadc523ba73b49c (diff)
iio: use make_block_sptr in make
Signed-off-by: Josh Morman <jmorman@peratonlabs.com>
Diffstat
-rw-r--r--gr-iio/lib/attr_sink_impl.cc3
-rw-r--r--gr-iio/lib/attr_source_impl.cc20
-rw-r--r--gr-iio/lib/attr_updater_impl.cc3
-rw-r--r--gr-iio/lib/dds_control_impl.cc4
-rw-r--r--gr-iio/lib/device_sink_impl.cc18
-rw-r--r--gr-iio/lib/device_source_impl.cc4
-rw-r--r--gr-iio/lib/fmcomms2_sink_impl.cc4
-rw-r--r--gr-iio/lib/fmcomms5_sink_impl.cc50
-rw-r--r--gr-iio/lib/fmcomms5_source_impl.cc62
9 files changed, 83 insertions, 85 deletions
diff --git a/gr-iio/lib/attr_sink_impl.cc b/gr-iio/lib/attr_sink_impl.cc
index 61e05edc6c..2ab021cd85 100644
--- a/gr-iio/lib/attr_sink_impl.cc
+++ b/gr-iio/lib/attr_sink_impl.cc
@@ -26,8 +26,7 @@ attr_sink::sptr attr_sink::make(const std::string& uri,
attr_type_t type,
bool output)
{
- return gnuradio::get_initial_sptr(
- new attr_sink_impl(uri, device, channel, type, output));
+ return gnuradio::make_block_sptr<attr_sink_impl>(uri, device, channel, type, output);
}
/*
diff --git a/gr-iio/lib/attr_source_impl.cc b/gr-iio/lib/attr_source_impl.cc
index aa0a1aec73..83db4baff5 100644
--- a/gr-iio/lib/attr_source_impl.cc
+++ b/gr-iio/lib/attr_source_impl.cc
@@ -35,16 +35,16 @@ attr_source::sptr attr_source::make(const std::string& uri,
bool output,
uint32_t address)
{
- return gnuradio::get_initial_sptr(new attr_source_impl(uri,
- device,
- channel,
- attribute,
- update_interval_ms,
- samples_per_update,
- data_type,
- attr_type,
- output,
- address));
+ return gnuradio::make_block_sptr<attr_source_impl>(uri,
+ device,
+ channel,
+ attribute,
+ update_interval_ms,
+ samples_per_update,
+ data_type,
+ attr_type,
+ output,
+ address);
}
size_t attr_source_impl::type_sizeof(data_type_t data_type, attr_type_t attr_type)
diff --git a/gr-iio/lib/attr_updater_impl.cc b/gr-iio/lib/attr_updater_impl.cc
index 2657f9cb22..0a42651c35 100644
--- a/gr-iio/lib/attr_updater_impl.cc
+++ b/gr-iio/lib/attr_updater_impl.cc
@@ -25,8 +25,7 @@ attr_updater::sptr attr_updater::make(const std::string attribute,
const std::string value,
unsigned int interval_ms)
{
- return gnuradio::get_initial_sptr(
- new attr_updater_impl(attribute, value, interval_ms));
+ return gnuradio::make_block_sptr<attr_updater_impl>(attribute, value, interval_ms);
}
/*
diff --git a/gr-iio/lib/dds_control_impl.cc b/gr-iio/lib/dds_control_impl.cc
index 3d0defd179..687b8b5d87 100644
--- a/gr-iio/lib/dds_control_impl.cc
+++ b/gr-iio/lib/dds_control_impl.cc
@@ -28,8 +28,8 @@ dds_control::sptr dds_control::make(const std::string& uri,
std::vector<float> phases,
std::vector<float> scales)
{
- return gnuradio::get_initial_sptr(
- new dds_control_impl(uri, enabled, frequencies, phases, scales));
+ return gnuradio::make_block_sptr<dds_control_impl>(
+ uri, enabled, frequencies, phases, scales);
}
/*
diff --git a/gr-iio/lib/device_sink_impl.cc b/gr-iio/lib/device_sink_impl.cc
index dc4a360bf0..6a6cde007d 100644
--- a/gr-iio/lib/device_sink_impl.cc
+++ b/gr-iio/lib/device_sink_impl.cc
@@ -53,15 +53,15 @@ device_sink::sptr device_sink::make_from(iio_context* ctx,
unsigned int interpolation,
bool cyclic)
{
- return gnuradio::get_initial_sptr(new device_sink_impl(ctx,
- false,
- device,
- channels,
- device_phy,
- params,
- buffer_size,
- interpolation,
- cyclic));
+ return gnuradio::make_block_sptr<device_sink_impl>(ctx,
+ false,
+ device,
+ channels,
+ device_phy,
+ params,
+ buffer_size,
+ interpolation,
+ cyclic);
}
void device_sink_impl::set_params(const std::vector<std::string>& params)
diff --git a/gr-iio/lib/device_source_impl.cc b/gr-iio/lib/device_source_impl.cc
index 87ae3c1a2a..27268536e2 100644
--- a/gr-iio/lib/device_source_impl.cc
+++ b/gr-iio/lib/device_source_impl.cc
@@ -52,8 +52,8 @@ device_source::sptr device_source::make_from(iio_context* ctx,
unsigned int buffer_size,
unsigned int decimation)
{
- return gnuradio::get_initial_sptr(new device_source_impl(
- ctx, false, device, channels, device_phy, params, buffer_size, decimation));
+ return gnuradio::make_block_sptr<device_source_impl>(
+ ctx, false, device, channels, device_phy, params, buffer_size, decimation);
}
void device_source_impl::set_params(iio_device* phy,
diff --git a/gr-iio/lib/fmcomms2_sink_impl.cc b/gr-iio/lib/fmcomms2_sink_impl.cc
index f158ab6d9b..b2523b0e47 100644
--- a/gr-iio/lib/fmcomms2_sink_impl.cc
+++ b/gr-iio/lib/fmcomms2_sink_impl.cc
@@ -34,8 +34,8 @@ typename fmcomms2_sink<T>::sptr fmcomms2_sink<T>::make(const std::string& uri,
unsigned long buffer_size,
bool cyclic)
{
- return gnuradio::get_initial_sptr(new fmcomms2_sink_impl<T>(
- device_source_impl::get_context(uri), ch_en, buffer_size, cyclic));
+ return gnuradio::make_block_sptr<fmcomms2_sink_impl<T>>(
+ device_source_impl::get_context(uri), ch_en, buffer_size, cyclic);
}
template <typename T>
diff --git a/gr-iio/lib/fmcomms5_sink_impl.cc b/gr-iio/lib/fmcomms5_sink_impl.cc
index e6126e237b..641cf26017 100644
--- a/gr-iio/lib/fmcomms5_sink_impl.cc
+++ b/gr-iio/lib/fmcomms5_sink_impl.cc
@@ -130,31 +130,31 @@ fmcomms5_sink::sptr fmcomms5_sink::make_from(iio_context* ctx,
float Fpass,
float Fstop)
{
- return gnuradio::get_initial_sptr(new fmcomms5_sink_impl(ctx,
- false,
- frequency1,
- frequency2,
- samplerate,
- bandwidth,
- ch1_en,
- ch2_en,
- ch3_en,
- ch4_en,
- ch5_en,
- ch6_en,
- ch7_en,
- ch8_en,
- buffer_size,
- cyclic,
- rf_port_select,
- attenuation1,
- attenuation2,
- attenuation3,
- attenuation4,
- filter_source,
- filter_filename,
- Fpass,
- Fstop));
+ return gnuradio::make_block_sptr<fmcomms5_sink_impl>(ctx,
+ false,
+ frequency1,
+ frequency2,
+ samplerate,
+ bandwidth,
+ ch1_en,
+ ch2_en,
+ ch3_en,
+ ch4_en,
+ ch5_en,
+ ch6_en,
+ ch7_en,
+ ch8_en,
+ buffer_size,
+ cyclic,
+ rf_port_select,
+ attenuation1,
+ attenuation2,
+ attenuation3,
+ attenuation4,
+ filter_source,
+ filter_filename,
+ Fpass,
+ Fstop);
}
std::vector<std::string> fmcomms5_sink_impl::get_channels_vector(bool ch1_en,
diff --git a/gr-iio/lib/fmcomms5_source_impl.cc b/gr-iio/lib/fmcomms5_source_impl.cc
index ef8908d7d5..9cd7ff94b8 100644
--- a/gr-iio/lib/fmcomms5_source_impl.cc
+++ b/gr-iio/lib/fmcomms5_source_impl.cc
@@ -147,37 +147,37 @@ fmcomms5_source::sptr fmcomms5_source::make_from(iio_context* ctx,
float Fpass,
float Fstop)
{
- return gnuradio::get_initial_sptr(new fmcomms5_source_impl(ctx,
- false,
- frequency1,
- frequency2,
- samplerate,
- bandwidth,
- ch1_en,
- ch2_en,
- ch3_en,
- ch4_en,
- ch5_en,
- ch6_en,
- ch7_en,
- ch8_en,
- buffer_size,
- quadrature,
- rfdc,
- bbdc,
- gain1,
- gain1_value,
- gain2,
- gain2_value,
- gain3,
- gain3_value,
- gain4,
- gain4_value,
- port_select,
- filter_source,
- filter_filename,
- Fpass,
- Fstop));
+ return gnuradio::make_block_sptr<fmcomms5_source_impl>(ctx,
+ false,
+ frequency1,
+ frequency2,
+ samplerate,
+ bandwidth,
+ ch1_en,
+ ch2_en,
+ ch3_en,
+ ch4_en,
+ ch5_en,
+ ch6_en,
+ ch7_en,
+ ch8_en,
+ buffer_size,
+ quadrature,
+ rfdc,
+ bbdc,
+ gain1,
+ gain1_value,
+ gain2,
+ gain2_value,
+ gain3,
+ gain3_value,
+ gain4,
+ gain4_value,
+ port_select,
+ filter_source,
+ filter_filename,
+ Fpass,
+ Fstop);
}
std::vector<std::string> fmcomms5_source_impl::get_channels_vector(bool ch1_en,
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 09:26:16 +0000