Skip to content

Commit 3125ad4

Browse files
committed
plugins/ad9371_adv: Reenable and update to libiio 1.x API
Signed-off-by: Dan Nechita <[email protected]>
1 parent e6d8b49 commit 3125ad4

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

plugins/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set(PLUGINS
2323
fmcomms6
2424
fmcomms11
2525
ad9371
26-
#ad9371_adv
26+
ad9371_adv
2727
#adrv9009
2828
#adrv9009_adv
2929
#ad6676

plugins/ad9371_adv.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323
#include <time.h>
2424
#include <unistd.h>
2525

26-
#include <iio.h>
26+
#include <iio/iio.h>
2727

2828
#include "../libini2.h"
2929
#include "../osc.h"
3030
#include "../osc_plugin.h"
3131
#include "../config.h"
3232
#include "../iio_widget.h"
3333
#include "../datatypes.h"
34+
#include "../iio_utils.h"
3435

3536

3637
#define PHY_DEVICE "ad9371-phy"
@@ -843,7 +844,7 @@ static void signal_handler_cb (GtkWidget *widget, gpointer data)
843844
val = (long long) gtk_spin_button_get_value(GTK_SPIN_BUTTON (widget));
844845

845846
if (item->lut_len) {
846-
iio_device_debug_attr_read_longlong(dev, item->name, &mask);
847+
dev_debug_attr_read_longlong(dev, item->name, &mask);
847848
mask &= ~((1 << item->lut_len) - 1);
848849
mask |= val & ((1 << item->lut_len) - 1);
849850
val = mask;
@@ -863,21 +864,21 @@ static void signal_handler_cb (GtkWidget *widget, gpointer data)
863864
if (ret != 2)
864865
return;
865866

866-
iio_device_debug_attr_read_longlong(dev, str, &mask);
867+
dev_debug_attr_read_longlong(dev, str, &mask);
867868

868869
if (val) {
869870
mask |= (1 << bit);
870871
} else {
871872
mask &= ~(1 << bit);
872873
}
873-
iio_device_debug_attr_write_longlong(dev, str, mask);
874+
dev_debug_attr_write_longlong(dev, str, mask);
874875

875876
return;
876877
default:
877878
return;
878879
}
879880

880-
iio_device_debug_attr_write_longlong(dev, item->name, val);
881+
dev_debug_attr_write_longlong(dev, item->name, val);
881882

882883
if (!strcmp(item->name, "initialize")) {
883884
reload_settings();
@@ -900,8 +901,8 @@ static void bist_tone_cb (GtkWidget *widget, gpointer data)
900901

901902
sprintf(temp, "%u %u %u", enable, tx1_freq, tx2_freq);
902903

903-
iio_device_debug_attr_write(dev, "bist_tone", "0 0 0");
904-
iio_device_debug_attr_write(dev, "bist_tone", temp);
904+
dev_debug_attr_write_string(dev, "bist_tone", "0 0 0");
905+
dev_debug_attr_write_string(dev, "bist_tone", temp);
905906
}
906907

907908
static char * set_widget_value(GtkWidget *widget, struct w_info *item, long long val)
@@ -1013,12 +1014,12 @@ static int __update_widget(struct iio_device *dev, const char *attr,
10131014

10141015
static int connect_widgets(GtkBuilder *builder)
10151016
{
1016-
return iio_device_debug_attr_read_all(dev, __connect_widget, builder);
1017+
return dev_debug_attr_read_all(dev, __connect_widget, builder);
10171018
}
10181019

10191020
static int update_widgets(GtkBuilder *builder)
10201021
{
1021-
return iio_device_debug_attr_read_all(dev, __update_widget, builder);
1022+
return dev_debug_attr_read_all(dev, __update_widget, builder);
10221023
}
10231024

10241025
static void change_page_cb (GtkNotebook *notebook, GtkNotebookTab *page,

0 commit comments

Comments
 (0)