X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=6b5cd7af6027e16eeb4e0a7da3c6fa8ea162f819;hb=5e59cfbfc736aab9e79caef4ab6bdcbc500e254f;hp=33ff79d92779bbefa768541eb0f70b0ca533104f;hpb=8722c31e26ecebfc75035a566d4d72d07761ef14;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index 33ff79d9..6b5cd7af 100644
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -24,11 +24,11 @@
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* The list of loaded plugins lives here. */
-GSList *plugins;
+static GSList *plugins;
 
 /*
  * This enumerates which plugin capabilities correspond to user-settable
@@ -39,6 +39,7 @@ struct sr_hwcap_option sr_hwcap_options[] = {
 	{SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
 	{SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
 	{SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
+	{SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"},
 	{0, 0, NULL, NULL},
 };
 
@@ -67,7 +68,6 @@ extern struct sr_device_plugin link_mso19_plugin_info;
 extern struct sr_device_plugin alsa_plugin_info;
 #endif
 
-
 /* TODO: No linked list needed, this can be a simple array. */
 int load_hwplugins(void)
 {
@@ -98,7 +98,6 @@ int load_hwplugins(void)
 	plugins = g_slist_append(plugins, (gpointer *)&alsa_plugin_info);
 #endif
 
-
 	return SR_OK;
 }
 
@@ -109,16 +108,32 @@ GSList *sr_list_hwplugins(void)
 
 int sr_init_hwplugins(struct sr_device_plugin *plugin)
 {
-	int num_devices, num_probes, i;
+	int num_devices, num_probes, i, j;
+	int num_initialized_devices = 0;
+	struct sr_device *device;
+	char **probe_names;
 
 	g_message("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);
-		sr_device_new(plugin, i, num_probes);
+		num_probes = GPOINTER_TO_INT(
+				plugin->get_device_info(i, SR_DI_NUM_PROBES));
+		probe_names = (char **)plugin->get_device_info(i,
+							SR_DI_PROBE_NAMES);
+
+		if (!probe_names) {
+			sr_warn("hwplugin: %s: plugin %s does not return a "
+				"list of probe names", __func__, plugin->name);
+			continue;
+		}
+
+		device = sr_device_new(plugin, i);
+		for (j = 0; j < num_probes; j++)
+			sr_device_probe_add(device, probe_names[j]);
+		num_initialized_devices++;
 	}
 
-	return num_devices;
+	return num_initialized_devices;
 }
 
 void sr_cleanup_hwplugins(void)
@@ -131,7 +146,6 @@ void sr_cleanup_hwplugins(void)
 		if (plugin->cleanup)
 			plugin->cleanup();
 	}
-
 }
 
 struct sr_device_instance *sr_device_instance_new(int index, int status,
@@ -193,7 +207,6 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
 	g_free(sdi->model);
 	g_free(sdi->version);
 	g_free(sdi);
-
 }
 
 #ifdef HAVE_LIBUSB_1_0
@@ -216,7 +229,7 @@ struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
 void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
 {
 	/* Avoid compiler warnings. */
-	usb = usb;
+	(void)usb;
 
 	/* Nothing to do for this device instance type. */
 }