Skip to content

Commit a3ffdd4

Browse files
oscplot.c: use libiio v1 API
Signed-off-by: Cristina Suteu <[email protected]>
1 parent bf5e9f3 commit a3ffdd4

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

Diff for: oscplot.c

+15-6
Original file line numberDiff line numberDiff line change
@@ -2113,6 +2113,7 @@ static gboolean check_valid_setup_of_device(OscPlot *plot, const char *name)
21132113
struct iio_device *dev;
21142114
unsigned int nb_channels = num_of_channels_of_device(treeview, name);
21152115
unsigned enabled_channels_mask;
2116+
const struct iio_channels_mask *mask = NULL;
21162117

21172118
GtkTreeModel *model;
21182119
GtkTreeIter iter;
@@ -2128,7 +2129,13 @@ static gboolean check_valid_setup_of_device(OscPlot *plot, const char *name)
21282129
if (!device_enabled && plot_type != TIME_PLOT)
21292130
return true;
21302131

2132+
/* No additional checking is needed for non iio devices */
2133+
if (!dev)
2134+
return TRUE;
21312135
num_enabled = enabled_channels_of_device(treeview, name, &enabled_channels_mask);
2136+
mask = iio_create_channels_mask(iio_device_get_channels_count(dev));
2137+
2138+
21322139

21332140
/* Basic validation rules */
21342141
if (plot_type == FFT_PLOT) {
@@ -2148,7 +2155,8 @@ static gboolean check_valid_setup_of_device(OscPlot *plot, const char *name)
21482155
gtk_widget_set_tooltip_text(priv->capture_button,
21492156
"Time Domain needs at least one channel");
21502157
return false;
2151-
} else if (dev && !dma_valid_selection(name, enabled_channels_mask | global_enabled_channels_mask(dev), nb_channels)) {
2158+
} else if (dev && !dma_valid_selection(name, enabled_channels_mask |
2159+
global_enabled_channels_mask(dev, (struct iio_channels_mask *) mask), nb_channels)) {
21522160
gtk_widget_set_tooltip_text(priv->capture_button,
21532161
"Channel selection not supported");
21542162
return false;
@@ -2161,17 +2169,17 @@ static gboolean check_valid_setup_of_device(OscPlot *plot, const char *name)
21612169
}
21622170
}
21632171

2164-
/* No additional checking is needed for non iio devices */
2165-
if (!dev)
2166-
return TRUE;
2172+
2173+
21672174

21682175
char warning_text[100];
21692176

21702177
/* Check if devices that need a trigger have one and it's configured */
21712178
const struct iio_device *trigger;
21722179
int ret;
21732180

2174-
ret = iio_device_get_trigger(dev, &trigger);
2181+
trigger = iio_device_get_trigger(dev);
2182+
ret = iio_err(trigger);
21752183
if (ret == 0 && trigger == NULL && num_enabled > 0) {
21762184
snprintf(warning_text, sizeof(warning_text),
21772185
"Device %s needs an impulse generator", name);
@@ -6755,7 +6763,8 @@ static gboolean right_click_menu_show(OscPlot *plot, GdkEvent *event)
67556763
bool needs_trigger;
67566764
int ret;
67576765

6758-
ret = iio_device_get_trigger(dev, &trigger);
6766+
trigger = iio_device_get_trigger(dev);
6767+
ret = iio_err(trigger);
67596768
needs_trigger = false;
67606769
if (ret == 0) {
67616770
needs_trigger = true;

0 commit comments

Comments
 (0)