]> sigrok.org Git - sigrok-gtk.git/commitdiff
sr: rename more functions to sr_thing_action format
authorBert Vermeulen <redacted>
Mon, 13 Feb 2012 23:23:51 +0000 (00:23 +0100)
committerBert Vermeulen <redacted>
Mon, 13 Feb 2012 23:23:51 +0000 (00:23 +0100)
Also improved the interface to find capabilities in a hardware plugin.

toolbar.c

index 73fec3e0956280e60344f81b0b2ec9db888089d9..3a3f835722da0e05e53eda645428f677984188f7 100644 (file)
--- a/toolbar.c
+++ b/toolbar.c
@@ -143,7 +143,7 @@ static void dev_set_options(GtkAction *action, GtkWindow *parent)
        GtkTreeIter iter;
        for (cap = 0; capabilities[cap]; cap++) {
                struct sr_hwcap_option *hwo;
-               if (!(hwo = sr_find_hwcap_option(capabilities[cap])))
+               if (!(hwo = sr_hwplugins_hwcap_get(capabilities[cap])))
                        continue;
                gtk_list_store_append(props, &iter);
                gtk_list_store_set(props, &iter, 
@@ -354,8 +354,7 @@ static void capture_run(GtkAction *action, GObject *parent)
        }
 
        if (time_msec) {
-               int *capabilities = device->plugin->get_capabilities();
-               if (sr_has_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) {
+               if (sr_hwplugin_has_hwcap(device->plugin, SR_HWCAP_LIMIT_MSEC)) {
                        if (device->plugin->set_configuration(device->plugin_index,
                                                        SR_HWCAP_LIMIT_MSEC,
                                                        &time_msec) != SR_OK) {