X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=6e9a30086b610a590ac9c3190ff5698751758166;hb=15f2d0c0f2e39bc4338b0781b581aced0fca8e0c;hp=04d463c13e2a9fe34d85a6fe7cdd4095be9ecae8;hpb=218557b85a308adc6ac533eb3f33d3dee17c13f8;p=libsigrok.git

diff --git a/device.c b/device.c
index 04d463c1..6e9a3008 100644
--- a/device.c
+++ b/device.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 extern struct sr_global *global;
 
@@ -30,7 +31,7 @@ void sr_device_scan(void)
 	GSList *plugins, *l;
 	struct sr_device_plugin *plugin;
 
-	plugins = list_hwplugins();
+	plugins = sr_list_hwplugins();
 
 	/*
 	 * Initialize all plugins first. Since the init() call may involve
@@ -48,7 +49,7 @@ int sr_device_plugin_init(struct sr_device_plugin *plugin)
 {
 	int num_devices, num_probes, i;
 
-	g_message("initializing %s plugin", plugin->name);
+	sr_info("initializing %s plugin", plugin->name);
 	num_devices = plugin->init(NULL);
 	for (i = 0; i < num_devices; i++) {
 		num_probes = (int)plugin->get_device_info(i, SR_DI_NUM_PROBES);
@@ -146,7 +147,7 @@ void sr_device_probe_clear(struct sr_device *device, int probenum)
 	}
 }
 
-void sr_device_probe_add(struct sr_device *device, char *name)
+void sr_device_probe_add(struct sr_device *device, const char *name)
 {
 	struct sr_probe *p;
 	char probename[16];
@@ -184,7 +185,8 @@ struct sr_probe *sr_device_probe_find(struct sr_device *device, int probenum)
 }
 
 /* TODO: return SIGROK_ERR if probenum not found */
-void sr_device_probe_name(struct sr_device *device, int probenum, char *name)
+void sr_device_probe_name(struct sr_device *device, int probenum,
+			  const char *name)
 {
 	struct sr_probe *p;
 
@@ -216,7 +218,8 @@ void sr_device_trigger_clear(struct sr_device *device)
 }
 
 /* TODO: return SIGROK_ERR if probenum not found */
-void sr_device_trigger_set(struct sr_device *device, int probenum, char *trigger)
+void sr_device_trigger_set(struct sr_device *device, int probenum,
+			   const char *trigger)
 {
 	struct sr_probe *p;
 
@@ -236,7 +239,7 @@ gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap)
 	int *capabilities, i;
 
 	if (!device || !device->plugin)
-		return;
+		return FALSE;
 
 	if ((capabilities = device->plugin->get_capabilities()))
 		for (i = 0; capabilities[i]; i++)