sr/cli/gtk/qt: s/get_dev_info/dev_info_get/.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index b8e4bddd8daa472625aa215fec5bca5a3bc93823..b924f0d65c3547871634fb0d61c3bf7ec19908f3 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -134,8 +134,8 @@ SR_API int sr_hw_init(struct sr_dev_plugin *plugin)
        num_devs = plugin->init(NULL);
        for (i = 0; i < num_devs; i++) {
                num_probes = GPOINTER_TO_INT(
-                               plugin->get_dev_info(i, SR_DI_NUM_PROBES));
-               probe_names = (char **)plugin->get_dev_info(i,
+                               plugin->dev_info_get(i, SR_DI_NUM_PROBES));
+               probe_names = (char **)plugin->dev_info_get(i,
                                                        SR_DI_PROBE_NAMES);
 
                if (!probe_names) {
@@ -270,11 +270,11 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
  */
 SR_API gboolean sr_hw_has_hwcap(struct sr_dev_plugin *plugin, int hwcap)
 {
-       int *capabilities, i;
+       int *hwcaps, i;
 
-       capabilities = plugin->get_capabilities();
-       for (i = 0; capabilities[i]; i++) {
-               if (capabilities[i] == hwcap)
+       hwcaps = plugin->hwcap_get_all();
+       for (i = 0; hwcaps[i]; i++) {
+               if (hwcaps[i] == hwcap)
                        return TRUE;
        }
 
@@ -293,8 +293,8 @@ SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
 {
        int i;
 
-       for (i = 0; sr_hwcap_options[i].capability; i++) {
-               if (sr_hwcap_options[i].capability == hwcap)
+       for (i = 0; sr_hwcap_options[i].hwcap; i++) {
+               if (sr_hwcap_options[i].hwcap == hwcap)
                        return &sr_hwcap_options[i];
        }