X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Flib.c;h=f1c3c0159a1b4cd52308ccd505be1d060899d4a5;hb=508ddda2a31b57aae2353345fd34072a4b80b292;hp=b5a4950843181cd9ddac5d1164c242ab9f680592;hpb=71185b48a114a8278e8baac04f5053ae046fdbcf;p=libsigrok.git

diff --git a/tests/lib.c b/tests/lib.c
index b5a49508..f1c3c015 100644
--- a/tests/lib.c
+++ b/tests/lib.c
@@ -23,7 +23,8 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <check.h>
-#include "../libsigrok.h"
+#include "../include/libsigrok/libsigrok.h"
+#include "lib.h"
 
 /* Get a libsigrok driver by name. */
 struct sr_dev_driver *srtest_driver_get(const char *drivername)
@@ -63,25 +64,6 @@ struct sr_input_format *srtest_input_get(const char *id)
 	return input;
 }
 
-/* Get a libsigrok output format by ID. */
-struct sr_output_format *srtest_output_get(const char *id)
-{
-	struct sr_output_format **outputs, *output = NULL;
-	int i;
-
-	outputs = sr_output_list();
-	fail_unless(outputs != NULL, "No output modules found.");
-
-	for (i = 0; outputs[i]; i++) {
-		if (strcmp(outputs[i]->id, id))
-			continue;
-		output = outputs[i];
-	}
-	fail_unless(output != NULL, "Output module '%s' not found.", id);
-
-	return output;
-}
-
 /* Initialize a libsigrok driver. */
 void srtest_driver_init(struct sr_context *sr_ctx, struct sr_dev_driver *driver)
 {
@@ -153,7 +135,7 @@ void srtest_set_samplerate(struct sr_dev_driver *driver, uint64_t samplerate)
 	sdi = g_slist_nth_data(driver->priv, 0);
 
 	gvar = g_variant_new_uint64(samplerate);
-	ret = driver->config_set(SR_CONF_SAMPLERATE, gvar, sdi);
+	ret = driver->config_set(SR_CONF_SAMPLERATE, gvar, sdi, NULL);
 	g_variant_unref(gvar);
 
 	fail_unless(ret == SR_OK, "%s: Failed to set SR_CONF_SAMPLERATE: %d.",
@@ -170,7 +152,7 @@ uint64_t srtest_get_samplerate(struct sr_dev_driver *driver)
 
 	sdi = g_slist_nth_data(driver->priv, 0);
 
-	ret = driver->config_get(SR_CONF_SAMPLERATE, &gvar, sdi);
+	ret = driver->config_get(SR_CONF_SAMPLERATE, &gvar, sdi, NULL);
 	samplerate = g_variant_get_uint64(gvar);
 	g_variant_unref(gvar);
 
@@ -198,7 +180,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 +192,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;
 }