Make more variables/functions static and non-global.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 33ff79d92779bbefa768541eb0f70b0ca533104f..0ffd6f2eeae77e17bbf0d86046b42771917d6a30 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -28,7 +28,7 @@
 #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;
 }
 
@@ -114,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);
        }
 
@@ -131,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,
@@ -193,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
@@ -216,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. */
 }