X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=fb8d60b28a5c3ad6dd20123a15120ba3c9bbdc28;hb=067d07166b8637a4146058b4fb4da2d628b34c37;hp=63b1f100560887a9205132b43035eed52ef772b3;hpb=01c3e9dbd5bd583012fc1f46237bf4fde784d209;p=libsigrok.git

diff --git a/device.c b/device.c
index 63b1f100..fb8d60b2 100644
--- a/device.c
+++ b/device.c
@@ -19,8 +19,8 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 static GSList *devs = NULL;
 
@@ -353,6 +353,8 @@ SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum,
 	g_free(p->trigger);
 
 	p->trigger = g_strdup(trigger);
+	sr_dbg("dev: %s: Setting '%s' trigger for probe %d.", __func__,
+	       p->trigger, probenum);
 
 	return SR_OK;
 }
@@ -373,7 +375,8 @@ SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum,
  */
 SR_API gboolean sr_dev_has_hwcap(const struct sr_dev *dev, int hwcap)
 {
-	int *hwcaps, i;
+	const int *hwcaps;
+	int i;
 
 	sr_spew("dev: %s: requesting hwcap %d", __func__, hwcap);
 
@@ -394,7 +397,8 @@ SR_API gboolean sr_dev_has_hwcap(const struct sr_dev *dev, int hwcap)
 
 	/* TODO: Sanity check on 'hwcap'. */
 
-	if (!(hwcaps = dev->driver->hwcap_get_all())) {
+	if (dev->driver->info_get(SR_DI_HWCAPS,
+			(const void **)&hwcaps, NULL) != SR_OK) {
 		sr_err("dev: %s: dev has no capabilities", __func__);
 		return FALSE;
 	}