X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwplugin.c;h=60a121c9a5dc5a67612b87a4034ab22bcf1209d4;hb=b7f09cf86dd57a59dc1bdece2cac9e4a176900b1;hp=f3401dc784ec9a3b9e8c9d70a382e358e4e30871;hpb=3a4d09c0de68c3ae9f287d243967431b8e3de0b7;p=libsigrok.git

diff --git a/hwplugin.c b/hwplugin.c
index f3401dc7..60a121c9 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,7 +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_CHAR, "Run Length Encoding", "rle"},
+	{SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"},
 	{0, 0, NULL, NULL},
 };
 
@@ -68,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)
 {
@@ -99,7 +98,6 @@ int load_hwplugins(void)
 	plugins = g_slist_append(plugins, (gpointer *)&alsa_plugin_info);
 #endif
 
-
 	return SR_OK;
 }
 
@@ -115,7 +113,8 @@ int sr_init_hwplugins(struct sr_device_plugin *plugin)
 	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);
+		num_probes = GPOINTER_TO_INT(
+				plugin->get_device_info(i, SR_DI_NUM_PROBES));
 		sr_device_new(plugin, i, num_probes);
 	}
 
@@ -132,7 +131,6 @@ void sr_cleanup_hwplugins(void)
 		if (plugin->cleanup)
 			plugin->cleanup();
 	}
-
 }
 
 struct sr_device_instance *sr_device_instance_new(int index, int status,
@@ -194,7 +192,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
@@ -217,7 +214,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. */
 }