From 87a07ba543d823a6532782321a28b88a5aa05b46 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 12:38:43 +0200 Subject: [PATCH 1/8] plugins/ad9081: Reenable and update to libiio v1.x Signed-off-by: Dan --- plugins/CMakeLists.txt | 2 +- plugins/ad9081.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index ccb1fd1fb..54e7fb706 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -43,7 +43,7 @@ set(PLUGINS #debug #spectrum_analyzer #scpi - #ad9081 + ad9081 #ad9084 #adrv9002 #cf_axi_tdd diff --git a/plugins/ad9081.c b/plugins/ad9081.c index a6aae5450..d55c1a541 100644 --- a/plugins/ad9081.c +++ b/plugins/ad9081.c @@ -310,7 +310,7 @@ static void ad9081_label_writer(GtkBuilder *builder, struct iio_channel *voltage if (!voltage) return; - ret = iio_channel_attr_read(voltage, "label", buf, sizeof(buf)); + ret = chn_attr_read_raw(voltage, "label", buf, sizeof(buf)); if (ret > 0) { GtkWidget *label; gchar *text, *id; @@ -368,7 +368,7 @@ static void load_pfir(GtkFileChooser *chooser, gpointer data) if (!buf) goto err; - ret = iio_device_attr_write_raw(priv->ad9081, "filter_fir_config", buf, size); + ret = dev_attr_write_raw(priv->ad9081, "filter_fir_config", buf, size); free(buf); if (ret < 0) goto err; @@ -457,7 +457,7 @@ static GtkWidget *ad9081_init(struct osc_plugin *plugin, GtkWidget *notebook, if (!ch0) ch0 = iio_device_find_channel(ad9081_dev, "voltage0", FALSE); - if (ch0 && iio_channel_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0) + if (ch0 && chn_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0) snprintf(attr_val, sizeof(attr_val), "%.2f", (double)(adc_freq / 1000000ul)); else @@ -488,7 +488,7 @@ static GtkWidget *ad9081_init(struct osc_plugin *plugin, GtkWidget *notebook, if (!ch0) ch0 = iio_device_find_channel(ad9081_dev, "voltage0", TRUE); - if (ch0 && iio_channel_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0) + if (ch0 && chn_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0) snprintf(attr_val, sizeof(attr_val), "%.2f", (double)(dac_freq / 1000000ul)); else @@ -583,7 +583,7 @@ static GtkWidget *ad9081_init(struct osc_plugin *plugin, GtkWidget *notebook, gtk_widget_show_all(dds_container); ch0 = iio_device_find_channel(dac, "altvoltage0", true); - if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) + if (chn_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) dac_tx_sampling_freq = (double)(dac_freq / 1000000ul); dac_data_manager_freq_widgets_range_update(priv->dac_tx_manager, From 15761c7329d68de7900d650270d76816cf4a1455 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 12:40:20 +0200 Subject: [PATCH 2/8] plugins/ad9084: Reenable and update to libiio v1.x Signed-off-by: Dan --- plugins/CMakeLists.txt | 2 +- plugins/ad9084.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 54e7fb706..5c91d732e 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -44,7 +44,7 @@ set(PLUGINS #spectrum_analyzer #scpi ad9081 - #ad9084 + ad9084 #adrv9002 #cf_axi_tdd #xmw diff --git a/plugins/ad9084.c b/plugins/ad9084.c index aa47942ed..4d46cae6c 100644 --- a/plugins/ad9084.c +++ b/plugins/ad9084.c @@ -333,7 +333,7 @@ static void ad9084_label_writer(GtkBuilder *builder, struct iio_channel *voltage if (!voltage) return; - ret = iio_channel_attr_read(voltage, "label", buf, sizeof(buf)); + ret = chn_attr_read_raw(voltage, "label", buf, sizeof(buf)); if (ret > 0) { GtkWidget *label; gchar *text, *id; @@ -391,7 +391,7 @@ static void load_pfir(GtkFileChooser *chooser, gpointer data) if (!buf) goto err; - ret = iio_device_attr_write_raw(priv->ad9084, "pfilt_config", buf, size); + ret = dev_attr_write_raw(priv->ad9084, "pfilt_config", buf, size); free(buf); if (ret < 0) goto err; @@ -425,7 +425,7 @@ static void load_cfir(GtkFileChooser *chooser, gpointer data) if (!buf) goto err; - ret = iio_device_attr_write_raw(priv->ad9084, "cfir_config", buf, size); + ret = dev_attr_write_raw(priv->ad9084, "cfir_config", buf, size); free(buf); if (ret < 0) goto err; @@ -521,7 +521,7 @@ static GtkWidget *ad9084_init(struct osc_plugin *plugin, GtkWidget *notebook, if (!ch0) ch0 = iio_device_find_channel(ad9084_dev, "voltage0", FALSE); - if (ch0 && iio_channel_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0) + if (ch0 && chn_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0) snprintf(attr_val, sizeof(attr_val), "%.2f", (double)(adc_freq / 1000000ul)); else @@ -552,7 +552,7 @@ static GtkWidget *ad9084_init(struct osc_plugin *plugin, GtkWidget *notebook, if (!ch0) ch0 = iio_device_find_channel(ad9084_dev, "voltage0", TRUE); - if (ch0 && iio_channel_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0) + if (ch0 && chn_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0) snprintf(attr_val, sizeof(attr_val), "%.2f", (double)(dac_freq / 1000000ul)); else @@ -647,7 +647,7 @@ static GtkWidget *ad9084_init(struct osc_plugin *plugin, GtkWidget *notebook, gtk_widget_show_all(dds_container); ch0 = iio_device_find_channel(dac, "altvoltage0", true); - if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) + if (chn_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) dac_tx_sampling_freq = (double)(dac_freq / 1000000ul); dac_data_manager_freq_widgets_range_update(priv->dac_tx_manager, From 792ea59205777a5803f50c72a9d9237084ad043e Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 13:03:51 +0200 Subject: [PATCH 3/8] plugins/adrv9002: Reenable and update to libiio v1.x Signed-off-by: Dan --- plugins/CMakeLists.txt | 2 +- plugins/adrv9002.c | 52 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 5c91d732e..86d7d64c8 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -45,7 +45,7 @@ set(PLUGINS #scpi ad9081 ad9084 - #adrv9002 + adrv9002 #cf_axi_tdd #xmw ) diff --git a/plugins/adrv9002.c b/plugins/adrv9002.c index 03c880c0c..770ffb1c7 100644 --- a/plugins/adrv9002.c +++ b/plugins/adrv9002.c @@ -561,7 +561,7 @@ static void adrv9002_run_cals(GtkWidget *widget, struct plugin_private *priv) { ssize_t ret; - ret = iio_device_attr_write(priv->adrv9002, "initial_calibrations", "run"); + ret = dev_attr_write_raw(priv->adrv9002, "initial_calibrations", "run", strlen("run")); if (ret < 0) dialog_box_message_error(widget, "Initial Calibrations", "Failed to re-run Initial Calibrations"); @@ -620,7 +620,7 @@ static void update_dac_manager(struct plugin_private *priv) struct iio_channel *ch0 = priv->dac_manager[i].ch0; long long dac_freq = 0; - if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) + if (chn_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) dac_tx_sampling_freq = (double)dac_freq / 1000000ul; dac_data_manager_freq_widgets_range_update(priv->dac_manager[i].dac_tx_manager, @@ -635,7 +635,7 @@ static void update_label(const struct adrv9002_gtklabel *label) double val; char attr_val[64]; - if (iio_channel_attr_read_double(label->chann, label->iio_attr, &val) == 0) + if (chn_attr_read_double(label->chann, label->iio_attr, &val) == 0) snprintf(attr_val, sizeof(attr_val), "%.4f", val / label->scale); else snprintf(attr_val, sizeof(attr_val), "%s", "error"); @@ -677,7 +677,7 @@ static void update_special_rx_widgets(struct adrv9002_rx *rx, const int n_widget * the RSSI level if the channel is not enabled. Hence, make sure we only update it * if the channel is enabled. */ - if (iio_channel_attr_read(rx[i].rx.ensm.chn, rx[i].rx.ensm.attr_name, ensm, + if (chn_attr_read_raw(rx[i].rx.ensm.chn, rx[i].rx.ensm.attr_name, ensm, sizeof(ensm)) > 0 && !strcmp(ensm, "rf_enabled")) update_label(&rx[i].rssi); update_label(&rx[i].decimated_power); @@ -743,7 +743,7 @@ static void adrv9002_update_orx_widgets(struct plugin_private *priv, const int c /* can we actually enable/disable orx?! */ sprintf(label, "powerdown_en_label_orx%d", orx->idx + 1); - ret = iio_channel_attr_read_longlong(orx->orx_en.chn, "orx_en", &dummy); + ret = chn_attr_read_longlong(orx->orx_en.chn, "orx_en", &dummy); /* * Lets' hide as this is not really supposed to change at runtime. However, we need * to do the check here as at the plugin initialization, the device might not have a @@ -824,7 +824,7 @@ static void adrv9002_profile_read(struct plugin_private *priv) ssize_t ret; GtkLabel *label = GTK_LABEL(gtk_builder_get_object(priv->builder, "profile_config_read")); - ret = iio_device_attr_read(priv->adrv9002, "profile_config", profile, sizeof(profile)); + ret = dev_attr_read_raw(priv->adrv9002, "profile_config", profile, sizeof(profile)); if (ret < 0) strcpy(profile, "error\n"); @@ -838,7 +838,7 @@ static void adrv9002_check_orx_status(struct plugin_private *priv, struct adrv90 char gtk_str[32]; sprintf(gtk_str, "frame_orx%d", orx->idx + 1); - ret = iio_channel_attr_read_double(orx->w[0].chn, "orx_hardwaregain", &dummy); + ret = chn_attr_read_double(orx->w[0].chn, "orx_hardwaregain", &dummy); if (ret == -ENODEV) { orx->enabled = false; gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(priv->builder, gtk_str))); @@ -859,7 +859,7 @@ static bool adrv9002_channel_is_enabled(struct adrv9002_common *chan) * wrong with the device). We can also just use the iio channel from the first * widget as the channel is the same for all widgets on this port... */ - ret = iio_channel_attr_read_double(chan->w[0].chn, "rf_bandwidth", &dummy); + ret = chn_attr_read_double(chan->w[0].chn, "rf_bandwidth", &dummy); if(ret < 0 && ret != -ENODEV) { printf("Warning: iio channel returned an error when reading it: %d. We assume the channel is enabled\n", @@ -906,7 +906,7 @@ static void adrv9002_check_nco_freq_support(struct plugin_private *priv, const i if (!c->enabled) return; - ret = iio_channel_attr_read_longlong(c->nco_freq.chn, "nco_frequency", &dummy); + ret = chn_attr_read_longlong(c->nco_freq.chn, "nco_frequency", &dummy); if (ret == -ENOTSUPP) { gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(priv->builder, label_str))); @@ -927,7 +927,7 @@ static void adrv9002_update_rx_intf_gain_attr_available(struct adrv9002_rx *rx) char text[512]; int ret; - ret = iio_channel_attr_read(w->chn, w->attr_name_avail, text, + ret = chn_attr_read_raw(w->chn, w->attr_name_avail, text, sizeof(text)); if (ret < 0) return; @@ -1042,7 +1042,7 @@ static void load_stream(GtkFileChooser *chooser, gpointer data) if (!buf) goto err; - ret = iio_device_attr_write_raw(priv->adrv9002, "stream_config", buf, size); + ret = dev_attr_write_raw(priv->adrv9002, "stream_config", buf, size); free(buf); if (ret < 0) goto err; @@ -1076,7 +1076,7 @@ static void load_profile(GtkFileChooser *chooser, gpointer data) g_source_remove(priv->refresh_timeout); iio_context_set_timeout(priv->ctx, 30000); - ret = iio_device_attr_write_raw(priv->adrv9002, "profile_config", buf, + ret = dev_attr_write_raw(priv->adrv9002, "profile_config", buf, size); free(buf); iio_context_set_timeout(priv->ctx, 5000); @@ -1318,7 +1318,7 @@ static int profile_gen_get_ssi_lanes_from_device(gpointer data, uint8_t *ssi_lan char profile_config[512]; int ret = 0; - ret = iio_device_attr_read(priv->adrv9002, "profile_config", profile_config, sizeof(profile_config)); + ret = dev_attr_read_raw(priv->adrv9002, "profile_config", profile_config, sizeof(profile_config)); if(ret < 0) { sprintf(message, "\nFailed to get device attr read %s! error code: %d", "profile_config", ret); goto iio_error; @@ -1359,7 +1359,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin radio_config radio_config; char buf[1024]; char profile_config[512]; - ret = iio_device_attr_read(priv->adrv9002, "profile_config", profile_config, sizeof(profile_config)); + ret = dev_attr_read_raw(priv->adrv9002, "profile_config", profile_config, sizeof(profile_config)); if(ret < 0) { sprintf(message, "\nFailed to get device attr read %s! error code: %d", "profile_config", ret); goto iio_error; @@ -1415,7 +1415,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin tx_config[chann].enabled = adrv9002_channel_is_enabled(&priv->tx_widgets[chann]); if(tx_config[chann].enabled) { // tx.sample_rate_hz - ret = iio_channel_attr_read(tx, "sampling_frequency", buf, sizeof(buf)); + ret = chn_attr_read_raw(tx, "sampling_frequency", buf, sizeof(buf)); if(ret < 0) { sprintf(message, "\nFailed to get tx channel: %s attr: %s! error code: %d", chann_str, "sampling_frequency", ret); @@ -1432,7 +1432,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin default_cfg.radio_cfg.tx_config[chann].analog_filter_power_mode; // TODO // tx.channel_bandwidth_hz - ret = iio_channel_attr_read(tx, "rf_bandwidth", buf, sizeof(buf)); + ret = chn_attr_read_raw(tx, "rf_bandwidth", buf, sizeof(buf)); if(ret < 0) { sprintf(message, "\nFailed to get tx channel: %s attr: %s! error code: %d", chann_str, "rf_bandwidth", ret); @@ -1470,7 +1470,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin rx_config[chann].enabled = adrv9002_channel_is_enabled(&priv->rx_widgets[chann].rx); if(rx_config[chann].enabled) { // rx.sample_rate_hz - ret = iio_channel_attr_read(rx, "sampling_frequency", buf, sizeof(buf)); + ret = chn_attr_read_raw(rx, "sampling_frequency", buf, sizeof(buf)); if(ret < 0) { sprintf(message, "\nFailed to get rx channel: %s attr: %s! error code: %d", chann_str, "sampling_frequency", ret); @@ -1487,7 +1487,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin default_cfg.radio_cfg.rx_config[chann].analog_filter_power_mode; // TODO // rx.channel_bandwidth_hz - ret = iio_channel_attr_read(rx, "rf_bandwidth", buf, sizeof(buf)); + ret = chn_attr_read_raw(rx, "rf_bandwidth", buf, sizeof(buf)); if(ret < 0) { sprintf(message, "\nFailed to get rx channel: %s attr: %s! error code: %d", chann_str, "rf_bandwidth", ret); @@ -1496,7 +1496,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin rx_config[chann].channel_bandwidth_hz = atoi(buf); // rx.adc_high_performance_mode - ret = iio_device_debug_attr_read(priv->adrv9002, chann == 0 ? "rx0_adc_type" : "rx1_adc_type", + ret = dev_debug_attr_read_raw(priv->adrv9002, chann == 0 ? "rx0_adc_type" : "rx1_adc_type", buf, sizeof(buf)); if(ret < 0) { sprintf(message, "\nFailed to get rx channel: %s attr: %s! error code: %d", chann_str, @@ -1517,7 +1517,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin rx_config[chann].nco_enable = default_cfg.radio_cfg.rx_config[chann].nco_enable; // TODO // rx.nco_frequency_hz - ret = iio_channel_attr_read(rx, "nco_frequency", buf, sizeof(buf)); + ret = chn_attr_read_raw(rx, "nco_frequency", buf, sizeof(buf)); if(ret < 0) { if(ret == -ENOTSUPP) { rx_config[chann].nco_frequency_hz = 0; @@ -1548,7 +1548,7 @@ static int profile_gen_config_get_from_device(struct adrv9002_config *cfg, gpoin radio_config.rx_config[chann] = rx_config[chann]; // tx.orx_enabled - ret = iio_channel_attr_read(rx, "orx_en", buf, sizeof(buf)); + ret = chn_attr_read_raw(rx, "orx_en", buf, sizeof(buf)); if(ret < 0) { if(ret == -ENODEV) { radio_config.tx_config[chann].orx_enabled = @@ -2299,7 +2299,7 @@ static bool profile_gen_check_api(gpointer data) struct plugin_private *priv = data; char version[256], message[BUFSIZ]; - if(iio_device_debug_attr_read(priv->adrv9002, "api_version", version, sizeof(version)) < 0) { + if(dev_debug_attr_read_raw(priv->adrv9002, "api_version", version, sizeof(version)) < 0) { sprintf(message, "\nCould not read API version!"); profile_gen_set_debug_info(data, message); goto err; @@ -2401,7 +2401,7 @@ static void profile_gen_load_config_to_device(GtkButton *self, gpointer data) goto err; } iio_context_set_timeout(priv->ctx, 30000); - ret = iio_device_attr_write_raw(priv->adrv9002, "profile_config", buf, size); + ret = dev_attr_write_raw(priv->adrv9002, "profile_config", buf, size); if(ret < 0) { sprintf(fail_message, "\nFailed to write the generated profile to device with error code: %d", ret); strcat(message, fail_message); @@ -2417,7 +2417,7 @@ static void profile_gen_load_config_to_device(GtkButton *self, gpointer data) goto err; } iio_context_set_timeout(priv->ctx, 30000); - ret = iio_device_attr_write_raw(priv->adrv9002, "stream_config", buf, size); + ret = dev_attr_write_raw(priv->adrv9002, "stream_config", buf, size); if(ret < 0) { sprintf(fail_message, "\nFailed to write the generated stream image to device with error code: %d", ret); @@ -2894,7 +2894,7 @@ static int adrv9002_dds_init(struct plugin_private *priv) goto free_dac; } priv->dac_manager[i].ch0 = ch0; - if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) + if (chn_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0) dac_tx_sampling_freq = (double)dac_freq / 1000000ul; dac_data_manager_freq_widgets_range_update(priv->dac_manager[i].dac_tx_manager, @@ -2928,7 +2928,7 @@ static void adrv9002_api_version_report(struct plugin_private *priv) GtkLabel *gapi = GTK_LABEL(gtk_builder_get_object(priv->builder, "api_version")); char api_version[16]; - if (iio_device_debug_attr_read(priv->adrv9002, "api_version", api_version, + if (dev_debug_attr_read_raw(priv->adrv9002, "api_version", api_version, sizeof(api_version)) < 0) { gtk_widget_hide(api_frame); return; From d40b050b9f97b695264f157fe7a1d497f7dcc5eb Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 17:39:13 +0200 Subject: [PATCH 4/8] plugins/ad9371: Reenable and update to libiio v1.x Signed-off-by: Dan --- plugins/CMakeLists.txt | 4 ++-- plugins/ad9371.c | 53 +++++++++++++++++++++--------------------- plugins/ad9371_adv.c | 21 ++++++++--------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 86d7d64c8..379f96732 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -22,8 +22,8 @@ set(PLUGINS #fmcomms5 #fmcomms6 #fmcomms11 - #ad9371 - #ad9371_adv + ad9371 + ad9371_adv #adrv9009 #adrv9009_adv #ad6676 diff --git a/plugins/ad9371.c b/plugins/ad9371.c index 578704e59..2895779f6 100644 --- a/plugins/ad9371.c +++ b/plugins/ad9371.c @@ -33,6 +33,7 @@ #include "../iio_utils.h" #include "block_diagram.h" #include "dac_data_manager.h" +#include "../iio_utils.h" //#include "fir_filter.h" //#include "scpi.h" @@ -334,7 +335,7 @@ static void update_lable_from(GtkWidget *label, const char *channel, char buf[80]; long long val = 0; - int ret = iio_channel_attr_read_longlong( + int ret = chn_attr_read_longlong( iio_device_find_channel(dev, channel, output), attribute, &val); @@ -360,7 +361,7 @@ static void update_lable_from_prms(GtkWidget *label, const char *channel, char buf[80]; long long val = 0; - int ret = iio_channel_attr_read_longlong( + int ret = chn_attr_read_longlong( iio_device_find_channel(dev, channel, output), attribute, &val); @@ -378,7 +379,7 @@ static void update_dpd_status_from(GtkWidget *label, const char *channel, { long long val = 0; - int ret = iio_channel_attr_read_longlong( + int ret = chn_attr_read_longlong( iio_device_find_channel(dev, channel, true), attribute, &val); @@ -394,7 +395,7 @@ static void update_vswr_status_from(GtkWidget *label, const char *channel, { long long val = 0; - int ret = iio_channel_attr_read_longlong( + int ret = chn_attr_read_longlong( iio_device_find_channel(dev, channel, true), attribute, &val); @@ -410,7 +411,7 @@ static void update_clgc_status_from(GtkWidget *label, const char *channel, { long long val = 0; - int ret = iio_channel_attr_read_longlong( + int ret = chn_attr_read_longlong( iio_device_find_channel(dev, channel, true), attribute, &val); @@ -544,10 +545,10 @@ int load_myk_profile(const char *file_name, iio_context_set_timeout(ctx, 30000); - ret = iio_device_attr_write_raw(dev1, + ret = dev_attr_write_raw(dev1, "profile_config", buf, len); if (dev2) { - ret2 = iio_device_attr_write_raw(dev2, + ret2 = dev_attr_write_raw(dev2, "profile_config", buf, len); ret = (ret > ret2) ? ret2 : ret; } @@ -599,13 +600,13 @@ static void glb_settings_update_labels(void) char buf[1024]; ssize_t ret; - ret = iio_device_attr_read(dev, "ensm_mode", buf, sizeof(buf)); + ret = dev_attr_read_raw(dev, "ensm_mode", buf, sizeof(buf)); if (ret > 0) gtk_label_set_text(GTK_LABEL(ensm_mode), buf); else gtk_label_set_text(GTK_LABEL(ensm_mode), ""); - ret = iio_channel_attr_read( + ret = chn_attr_read_raw( iio_device_find_channel(dev, "voltage0", false), "gain_control_mode", buf, sizeof(buf)); if (ret > 0) @@ -614,7 +615,7 @@ static void glb_settings_update_labels(void) gtk_label_set_text(GTK_LABEL(rx_gain_control_rx1), ""); if (is_2rx_2tx) { - ret = iio_channel_attr_read( + ret = chn_attr_read_raw( iio_device_find_channel(dev, "voltage1", false), "gain_control_mode", buf, sizeof(buf)); if (ret > 0) @@ -623,7 +624,7 @@ static void glb_settings_update_labels(void) gtk_label_set_text(GTK_LABEL(rx_gain_control_rx2), ""); } - ret = iio_channel_attr_read( + ret = chn_attr_read_raw( iio_device_find_channel(dev, "voltage2", false), "gain_control_mode", buf, sizeof(buf)); if (ret > 0) @@ -690,7 +691,7 @@ static void rssi_update_label(GtkWidget *label, const char *chn, bool is_tx) if (!gtk_widget_is_drawable(GTK_WIDGET(label))) return; - ret = iio_channel_attr_read( + ret = chn_attr_read_raw( iio_device_find_channel(dev, chn, is_tx), "rssi", buf, sizeof(buf)); if (ret > 0) @@ -792,11 +793,11 @@ static void updn_converter_lo_freq_changed_cb(GtkSpinButton *button, int data) target_freq = gtk_spin_button_get_value(button); split_target_lo_freq(target_freq, &updn_pll, &ad9371_lo, updn_freq_span, center_freq); - ret = iio_channel_attr_write_longlong(ad9371_ch, freq_name, (long long)MHZ_TO_HZ(ad9371_lo)); + ret = chn_attr_write_longlong(ad9371_ch, freq_name, (long long)MHZ_TO_HZ(ad9371_lo)); if (ret < 0) fprintf(stderr,"Write to %s attribute of %s device: %s\n", freq_name, PHY_DEVICE, strerror(-ret)); - ret = iio_channel_attr_write_longlong(updn_ch, "frequency", (long long)MHZ_TO_HZ(updn_pll)); + ret = chn_attr_write_longlong(updn_ch, "frequency", (long long)MHZ_TO_HZ(updn_pll)); if (ret < 0) fprintf(stderr,"Write to %s attribute of %s device: %s\n", "frequency", (UPDN_TX) ? UDC_TX_DEVICE : UDC_RX_DEVICE, strerror(-ret)); @@ -862,10 +863,10 @@ static void rx_phase_rotation_update() } for (i = 0; i <= d; i += 2) { - iio_channel_attr_read_double(out[i], "calibscale", &val[0]); - iio_channel_attr_read_double(out[i], "calibphase", &val[1]); - iio_channel_attr_read_double(out[i + 1], "calibscale", &val[2]); - iio_channel_attr_read_double(out[i + 1], "calibphase", &val[3]); + chn_attr_read_double(out[i], "calibscale", &val[0]); + chn_attr_read_double(out[i], "calibphase", &val[1]); + chn_attr_read_double(out[i + 1], "calibscale", &val[2]); + chn_attr_read_double(out[i + 1], "calibphase", &val[3]); val[0] = acos(val[0]) * 360.0 / (2.0 * M_PI); val[1] = asin(-1.0 * val[1]) * 360.0 / (2.0 * M_PI); @@ -984,14 +985,14 @@ static void int_dec_freq_update(void) gchar *text; ch = iio_device_find_channel(cap, "voltage0_i", false); - iio_channel_attr_read_double(ch, "sampling_frequency", &freq); + chn_attr_read_double(ch, "sampling_frequency", &freq); text = g_strdup_printf ("%f", freq / mhz_scale); gtk_label_set_text(GTK_LABEL(label_sampling_freq_rx), text); g_free(text); ch = iio_device_find_channel(dds, "voltage0", true); - iio_channel_attr_read_double(ch, "sampling_frequency", &freq); + chn_attr_read_double(ch, "sampling_frequency", &freq); text = g_strdup_printf ("%f", freq / mhz_scale); gtk_label_set_text(GTK_LABEL(label_sampling_freq_tx), g_strdup_printf ("%f", freq / mhz_scale)); @@ -1039,10 +1040,10 @@ static void rx_phase_rotation_set(GtkSpinButton *spinbutton, gpointer user_data) } if (out1 && out0) { - iio_channel_attr_write_double(out0, "calibscale", (double) cos(phase)); - iio_channel_attr_write_double(out0, "calibphase", (double) (-1 * sin(phase))); - iio_channel_attr_write_double(out1, "calibscale", (double) cos(phase)); - iio_channel_attr_write_double(out1, "calibphase", (double) sin(phase)); + chn_attr_write_double(out0, "calibscale", (double) cos(phase)); + chn_attr_write_double(out0, "calibphase", (double) (-1 * sin(phase))); + chn_attr_write_double(out1, "calibscale", (double) cos(phase)); + chn_attr_write_double(out1, "calibphase", (double) sin(phase)); } } @@ -1223,7 +1224,7 @@ static void load_profile(struct osc_plugin *plugin, const char *ini_fn) value = read_token_from_ini(ini_fn, THIS_DRIVER, PHY_DEVICE".in_voltage0_gain_control_mode"); if (ch && value) { - iio_channel_attr_write(ch, "gain_control_mode", value); + chn_attr_write_string(ch, "gain_control_mode", value); free(value); } @@ -1231,7 +1232,7 @@ static void load_profile(struct osc_plugin *plugin, const char *ini_fn) value = read_token_from_ini(ini_fn, THIS_DRIVER, PHY_DEVICE".in_voltage1_gain_control_mode"); if (ch && value) { - iio_channel_attr_write(ch, "gain_control_mode", value); + chn_attr_write_string(ch, "gain_control_mode", value); free(value); } diff --git a/plugins/ad9371_adv.c b/plugins/ad9371_adv.c index a25bc3314..a66b1dbff 100644 --- a/plugins/ad9371_adv.c +++ b/plugins/ad9371_adv.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "../libini2.h" #include "../osc.h" @@ -31,6 +31,7 @@ #include "../config.h" #include "../iio_widget.h" #include "../datatypes.h" +#include "../iio_utils.h" #define PHY_DEVICE "ad9371-phy" @@ -43,8 +44,6 @@ static struct iio_context *ctx; static struct iio_device *dev; -OscPlot *plot_xcorr_4ch; - static bool can_update_widgets; static gint this_page; @@ -843,7 +842,7 @@ static void signal_handler_cb (GtkWidget *widget, gpointer data) val = (long long) gtk_spin_button_get_value(GTK_SPIN_BUTTON (widget)); if (item->lut_len) { - iio_device_debug_attr_read_longlong(dev, item->name, &mask); + dev_debug_attr_read_longlong(dev, item->name, &mask); mask &= ~((1 << item->lut_len) - 1); mask |= val & ((1 << item->lut_len) - 1); val = mask; @@ -863,21 +862,21 @@ static void signal_handler_cb (GtkWidget *widget, gpointer data) if (ret != 2) return; - iio_device_debug_attr_read_longlong(dev, str, &mask); + dev_debug_attr_read_longlong(dev, str, &mask); if (val) { mask |= (1 << bit); } else { mask &= ~(1 << bit); } - iio_device_debug_attr_write_longlong(dev, str, mask); + dev_debug_attr_write_longlong(dev, str, mask); return; default: return; } - iio_device_debug_attr_write_longlong(dev, item->name, val); + dev_debug_attr_write_longlong(dev, item->name, val); if (!strcmp(item->name, "initialize")) { reload_settings(); @@ -900,8 +899,8 @@ static void bist_tone_cb (GtkWidget *widget, gpointer data) sprintf(temp, "%u %u %u", enable, tx1_freq, tx2_freq); - iio_device_debug_attr_write(dev, "bist_tone", "0 0 0"); - iio_device_debug_attr_write(dev, "bist_tone", temp); + dev_debug_attr_write_string(dev, "bist_tone", "0 0 0"); + dev_debug_attr_write_string(dev, "bist_tone", temp); } static char * set_widget_value(GtkWidget *widget, struct w_info *item, long long val) @@ -1013,12 +1012,12 @@ static int __update_widget(struct iio_device *dev, const char *attr, static int connect_widgets(GtkBuilder *builder) { - return iio_device_debug_attr_read_all(dev, __connect_widget, builder); + return dev_debug_attr_read_all(dev, __connect_widget, builder); } static int update_widgets(GtkBuilder *builder) { - return iio_device_debug_attr_read_all(dev, __update_widget, builder); + return dev_debug_attr_read_all(dev, __update_widget, builder); } static void change_page_cb (GtkNotebook *notebook, GtkNotebookTab *page, From f34da84380a782c2a30af2ec0d490133db1ead80 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 17:59:15 +0200 Subject: [PATCH 5/8] plugins/adrv9009: Reenable and update to libiio v1.x Signed-off-by: Dan --- plugins/CMakeLists.txt | 4 ++-- plugins/adrv9009.c | 42 +++++++++++++++++++++--------------------- plugins/adrv9009_adv.c | 18 +++++++++--------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 379f96732..898749b2d 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -24,8 +24,8 @@ set(PLUGINS #fmcomms11 ad9371 ad9371_adv - #adrv9009 - #adrv9009_adv + adrv9009 + adrv9009_adv #ad6676 #fmcadc3 #daq2 diff --git a/plugins/adrv9009.c b/plugins/adrv9009.c index fd0914ef9..2affab5ee 100644 --- a/plugins/adrv9009.c +++ b/plugins/adrv9009.c @@ -248,7 +248,7 @@ static void multichip_sync() return; /* Check for and skip in case of JESD204-FSM support */ - ret = iio_device_attr_write_longlong(subcomponents[0].iio_dev, "multichip_sync", 424242); + ret = dev_attr_write_longlong(subcomponents[0].iio_dev, "multichip_sync", 424242); if (ret != -EINVAL) return; @@ -272,7 +272,7 @@ static void multichip_sync() for (; i <= 11; i++) { guint n = 0; for (; n < phy_devs_count; n++) { - iio_device_attr_write_longlong(subcomponents[n].iio_dev, "multichip_sync", i); + dev_attr_write_longlong(subcomponents[n].iio_dev, "multichip_sync", i); } } } @@ -287,7 +287,7 @@ static void update_label_from(GtkWidget *label, struct iio_device *dev, const ch ch = iio_device_find_channel(dev, channel, output); if (ch) { - ret = iio_channel_attr_read_longlong(ch, attribute, &val); + ret = chn_attr_read_longlong(ch, attribute, &val); if (scale == 1) snprintf(buf, sizeof(buf), "%lld %s", val, unit); @@ -362,7 +362,7 @@ int load_tal_profile(const char *file_name, ret = INT_MAX; guint i = 0; for (; i < phy_devs_count; i++) { - ret2 = iio_device_attr_write_raw(subcomponents[i].iio_dev, "profile_config", buf, len); + ret2 = dev_attr_write_raw(subcomponents[i].iio_dev, "profile_config", buf, len); ret = (ret > ret2) ? ret2 : ret; } @@ -422,7 +422,7 @@ static void glb_settings_update_labels(void) /* Get ensm_mode from all devices. Notify user if any of devices has a different mode than the others. */ for (; i < phy_devs_count; i++) { - ret = iio_device_attr_read(subcomponents[i].iio_dev, "ensm_mode", buf, sizeof(buf)); + ret = dev_attr_read_raw(subcomponents[i].iio_dev, "ensm_mode", buf, sizeof(buf)); if (ret > 0) { if (i > 0) { if (strncmp(buf, gtk_label_get_text(GTK_LABEL(ensm_mode)), sizeof(buf))) { @@ -441,7 +441,7 @@ static void glb_settings_update_labels(void) for (i = 0; i < phy_devs_count; i++) { ch = iio_device_find_channel(subcomponents[i].iio_dev, "voltage0", false); if (ch) { - ret = iio_channel_attr_read(ch, "gain_control_mode", buf, sizeof(buf)); + ret = chn_attr_read_raw(ch, "gain_control_mode", buf, sizeof(buf)); } else { ret = 0; } @@ -453,7 +453,7 @@ static void glb_settings_update_labels(void) ch = iio_device_find_channel(subcomponents[i].iio_dev, "voltage1", false); if (ch) { - ret = iio_channel_attr_read(ch, "gain_control_mode", buf, sizeof(buf)); + ret = chn_attr_read_raw(ch, "gain_control_mode", buf, sizeof(buf)); } else { ret = 0; } @@ -496,7 +496,7 @@ static void set_ensm_mode_of_all_devices(const char *mode) guint i = 0; for (; i < phy_devs_count; i++) { - iio_device_attr_write_raw(subcomponents[i].iio_dev, "ensm_mode", mode, strlen(mode)); + dev_attr_write_raw(subcomponents[i].iio_dev, "ensm_mode", mode, strlen(mode)); } } @@ -568,7 +568,7 @@ static void int_dec_freq_update(void) return; ch = iio_device_find_channel(cap, "voltage0_i", false); - iio_channel_attr_read_double(ch, "sampling_frequency", &freq); + chn_attr_read_double(ch, "sampling_frequency", &freq); text = g_strdup_printf ("%f", freq / mhz_scale); guint i = 0; @@ -581,7 +581,7 @@ static void int_dec_freq_update(void) ch = iio_device_find_channel(dds, "voltage0", true); text = g_strdup_printf ("%f", freq / mhz_scale); - iio_channel_attr_read_double(ch, "sampling_frequency", &freq); + chn_attr_read_double(ch, "sampling_frequency", &freq); for (i = 0; i < phy_devs_count; i++) gtk_label_set_text(GTK_LABEL(subcomponents[i].label_sampling_freq_tx), text); @@ -603,7 +603,7 @@ static void rssi_update_label(GtkWidget *label, struct iio_channel *ch) if (!gtk_widget_is_drawable(GTK_WIDGET(label))) return; - ret = iio_channel_attr_read(ch, "rssi", buf, sizeof(buf)); + ret = chn_attr_read_raw(ch, "rssi", buf, sizeof(buf)); if (ret > 0) gtk_label_set_text(GTK_LABEL(label), buf); else @@ -666,10 +666,10 @@ static void rx_phase_rotation_update() struct iio_channel *i_chn = g_array_index(out, struct iio_channel*, i); struct iio_channel *q_chn = g_array_index(out, struct iio_channel*, i + 1); - iio_channel_attr_read_double(i_chn, "calibscale", &val[0]); - iio_channel_attr_read_double(i_chn, "calibphase", &val[1]); - iio_channel_attr_read_double(q_chn, "calibscale", &val[2]); - iio_channel_attr_read_double(q_chn, "calibphase", &val[3]); + chn_attr_read_double(i_chn, "calibscale", &val[0]); + chn_attr_read_double(i_chn, "calibphase", &val[1]); + chn_attr_read_double(q_chn, "calibscale", &val[2]); + chn_attr_read_double(q_chn, "calibphase", &val[3]); val[0] = acos(val[0]) * 360.0 / (2.0 * M_PI); val[1] = asin(-1.0 * val[1]) * 360.0 / (2.0 * M_PI); @@ -836,10 +836,10 @@ static void rx_phase_rotation_set(GtkSpinButton *spinbutton, gpointer user_data) } if (out1 && out0) { - iio_channel_attr_write_double(out0, "calibscale", (double) cos(phase)); - iio_channel_attr_write_double(out0, "calibphase", (double)(-1 * sin(phase))); - iio_channel_attr_write_double(out1, "calibscale", (double) cos(phase)); - iio_channel_attr_write_double(out1, "calibphase", (double) sin(phase)); + chn_attr_write_double(out0, "calibscale", (double) cos(phase)); + chn_attr_write_double(out0, "calibphase", (double)(-1 * sin(phase))); + chn_attr_write_double(out1, "calibscale", (double) cos(phase)); + chn_attr_write_double(out1, "calibphase", (double) sin(phase)); } } @@ -1032,7 +1032,7 @@ static void load_profile(struct osc_plugin *plugin, const char *ini_fn) g_free(attrib_name); if (ch && value) { - iio_channel_attr_write(ch, "gain_control_mode", value); + chn_attr_write_string(ch, "gain_control_mode", value); free(value); } @@ -1042,7 +1042,7 @@ static void load_profile(struct osc_plugin *plugin, const char *ini_fn) g_free(attrib_name); if (ch && value) { - iio_channel_attr_write(ch, "gain_control_mode", value); + chn_attr_write_string(ch, "gain_control_mode", value); free(value); } diff --git a/plugins/adrv9009_adv.c b/plugins/adrv9009_adv.c index ef3895357..bb0578256 100644 --- a/plugins/adrv9009_adv.c +++ b/plugins/adrv9009_adv.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "../libini2.h" #include "../osc.h" @@ -791,7 +791,7 @@ static void signal_handler_cb(GtkWidget *widget, gpointer data) val = (long long) gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); if (item->lut_len) { - iio_device_debug_attr_read_longlong(plugin->priv->dev, item->name, &mask); + dev_debug_attr_read_longlong(plugin->priv->dev, item->name, &mask); mask &= ~((1 << item->lut_len) - 1); mask |= val & ((1 << item->lut_len) - 1); val = mask; @@ -815,7 +815,7 @@ static void signal_handler_cb(GtkWidget *widget, gpointer data) if (ret != 2) return; - iio_device_debug_attr_read_longlong(plugin->priv->dev, str, &mask); + dev_debug_attr_read_longlong(plugin->priv->dev, str, &mask); if (val) { mask |= (1 << bit); @@ -823,7 +823,7 @@ static void signal_handler_cb(GtkWidget *widget, gpointer data) mask &= ~(1 << bit); } - iio_device_debug_attr_write_longlong(plugin->priv->dev, str, mask); + dev_debug_attr_write_longlong(plugin->priv->dev, str, mask); return; @@ -831,7 +831,7 @@ static void signal_handler_cb(GtkWidget *widget, gpointer data) return; } - iio_device_debug_attr_write_longlong(plugin->priv->dev, item->name, val); + dev_debug_attr_write_longlong(plugin->priv->dev, item->name, val); if (!strcmp(item->name, "initialize")) { reload_settings(); @@ -854,8 +854,8 @@ static void bist_tone_cb(GtkWidget *widget, gpointer data) sprintf(temp, "%u %u %u", enable, tx1_freq, tx2_freq); - iio_device_debug_attr_write(plugin->priv->dev, "bist_tone", "0 0 0"); - iio_device_debug_attr_write(plugin->priv->dev, "bist_tone", temp); + dev_debug_attr_write_string(plugin->priv->dev, "bist_tone", "0 0 0"); + dev_debug_attr_write_string(plugin->priv->dev, "bist_tone", temp); } static char *set_widget_value(GtkWidget *widget, struct w_info *item, long long val) @@ -990,12 +990,12 @@ static int __update_widget(struct iio_device *dev, const char *attr, static int connect_widgets(struct osc_plugin *plugin) { - return iio_device_debug_attr_read_all(plugin->priv->dev, __connect_widget, plugin); + return dev_debug_attr_read_all(plugin->priv->dev, __connect_widget, plugin); } static int update_widgets(struct osc_plugin *plugin) { - return iio_device_debug_attr_read_all(plugin->priv->dev, __update_widget, plugin->priv->builder); + return dev_debug_attr_read_all(plugin->priv->dev, __update_widget, plugin->priv->builder); } static void change_page_cb(GtkNotebook *notebook, GtkNotebookTab *page, From 13eff029ff46bab4b796dbf8d02d371016838928 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 23:03:10 +0200 Subject: [PATCH 6/8] plugins: Re-enable: ad6676, fmcadc3, pr_config, cf_axi_tdd, xmw, ad5628_1 Signed-off-by: Dan --- plugins/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 898749b2d..7c2924300 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -26,17 +26,17 @@ set(PLUGINS ad9371_adv adrv9009 adrv9009_adv - #ad6676 - #fmcadc3 + ad6676 + fmcadc3 #daq2 #ad9739a - #AD5628_1 + AD5628_1 #AD7303 cn0357 cn0508 cn0511 cn0540 - #pr_config + pr_config #motor_control #lidar #dmm @@ -46,8 +46,8 @@ set(PLUGINS ad9081 ad9084 adrv9002 - #cf_axi_tdd - #xmw + cf_axi_tdd + xmw ) set(LIBAD9166_PLUGINS cn0511) From 6d6b9c52f6ceba3d4f8a8c28b0ca6dc14e2e3ae6 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 23:06:10 +0200 Subject: [PATCH 7/8] plugins: Re-enable daq2 and update to libiio v1 Signed-off-by: Dan --- plugins/CMakeLists.txt | 2 +- plugins/daq2.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 7c2924300..330775ddb 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -28,7 +28,7 @@ set(PLUGINS adrv9009_adv ad6676 fmcadc3 - #daq2 + daq2 #ad9739a AD5628_1 #AD7303 diff --git a/plugins/daq2.c b/plugins/daq2.c index 2aa03f158..851dab053 100644 --- a/plugins/daq2.c +++ b/plugins/daq2.c @@ -21,8 +21,9 @@ #include #include -#include +#include +#include "../iio_utils.h" #include "../libini2.h" #include "../osc.h" #include "../iio_widget.h" @@ -296,7 +297,7 @@ static GtkWidget * daq2_init(struct osc_plugin *plugin, GtkWidget *notebook, con ch0 = iio_device_find_channel(adc, "voltage0", false); ch1 = iio_device_find_channel(adc, "voltage1", false); - if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) + if (chn_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) snprintf(attr_val, sizeof(attr_val), "%.3f", (double)val / 1000000.0); else snprintf(attr_val, sizeof(attr_val), "%s", "error"); @@ -314,7 +315,7 @@ static GtkWidget * daq2_init(struct osc_plugin *plugin, GtkWidget *notebook, con /* Tx Widgets */ ch0 = iio_device_find_channel(dac, "altvoltage0", true); - if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) { + if (chn_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) { tx_sampling_freq = (double)val / 1000000.0; snprintf(attr_val, sizeof(attr_val), "%.3f", tx_sampling_freq); } else { From 9fe12a20513168466910838c3aa96052e97abc66 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 10 Dec 2024 23:07:33 +0200 Subject: [PATCH 8/8] plugins: Re-enable ad9739a Signed-off-by: Dan --- plugins/CMakeLists.txt | 2 +- plugins/ad9739a.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 330775ddb..ca415ea15 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -29,7 +29,7 @@ set(PLUGINS ad6676 fmcadc3 daq2 - #ad9739a + ad9739a AD5628_1 #AD7303 cn0357 diff --git a/plugins/ad9739a.c b/plugins/ad9739a.c index ac91cd139..0dc0bd2ef 100644 --- a/plugins/ad9739a.c +++ b/plugins/ad9739a.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include "../libini2.h" #include "../osc.h"