X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Flib.c;h=ad0b3e1f38a2c75b9faa043385801e3ce4cc322c;hb=2fa222c78b522f6f23e8930f5a8c0bbc134fcc5c;hp=58edbf9e0caf459258f5126095c91326cd20c430;hpb=57d0a2e195c6dac9e00bf6af3aa35bc394500b15;p=libsigrok.git

diff --git a/tests/lib.c b/tests/lib.c
index 58edbf9e..ad0b3e1f 100644
--- a/tests/lib.c
+++ b/tests/lib.c
@@ -24,6 +24,7 @@
 #include <glib/gstdio.h>
 #include <check.h>
 #include "../libsigrok.h"
+#include "lib.h"
 
 /* Get a libsigrok driver by name. */
 struct sr_dev_driver *srtest_driver_get(const char *drivername)
@@ -198,7 +199,7 @@ void srtest_check_samplerate(struct sr_context *sr_ctx, const char *drivername,
 void srtest_buf_to_file(const char *filename, const uint8_t *buf, uint64_t len)
 {
 	FILE *f;
-	GError *error;
+	GError *error = NULL;
 	gboolean ret;
 
 	f = g_fopen(filename, "wb");
@@ -210,21 +211,21 @@ void srtest_buf_to_file(const char *filename, const uint8_t *buf, uint64_t len)
 	fclose(f);
 }
 
-GArray *srtest_get_enabled_logic_probes(const struct sr_dev_inst *sdi)
+GArray *srtest_get_enabled_logic_channels(const struct sr_dev_inst *sdi)
 {
-	struct sr_probe *probe;
-	GArray *probes;
+	struct sr_channel *ch;
+	GArray *channels;
 	GSList *l;
 
-	probes = g_array_new(FALSE, FALSE, sizeof(int));
-	for (l = sdi->probes; l; l = l->next) {
-		probe = l->data;
-		if (probe->type != SR_PROBE_LOGIC)
+	channels = g_array_new(FALSE, FALSE, sizeof(int));
+	for (l = sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
-		if (probe->enabled != TRUE)
+		if (ch->enabled != TRUE)
 			continue;
-		g_array_append_val(probes, probe->index);
+		g_array_append_val(channels, ch->index);
 	}
 
-	return probes;
+	return channels;
 }