sr: rename all sr_hwplugin(s)_* functions to sr_hw_*

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index d504f8b5cc883253e447a0e75b47758ce7f991c5..b3b229c063a979e28018cbf5ebaa947acdd9edd2 100644 (file)
--- a/device.c
+++ b/device.c
@@ -62,7 +62,7 @@ SR_API int sr_dev_scan(void)
        GSList *plugins, *l;
        struct sr_device_plugin *plugin;
 
-       if (!(plugins = sr_hwplugins_list())) {
+       if (!(plugins = sr_hw_list())) {
                sr_err("dev: %s: no supported devices/hwplugins", __func__);
                return SR_ERR; /* TODO: More specific error? */
        }
@@ -75,7 +75,7 @@ SR_API int sr_dev_scan(void)
        for (l = plugins; l; l = l->next) {
                plugin = l->data;
                /* TODO: Handle 'plugin' being NULL. */
-               sr_hwplugin_init(plugin);
+               sr_hw_init(plugin);
        }
 
        return SR_OK;
@@ -416,7 +416,7 @@ SR_API gboolean sr_dev_has_hwcap(const struct sr_device *device, int hwcap)
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or SR_ERR
  *         upon other errors.
  */
-int sr_dev_get_info(const struct sr_device *device, int id,
+SR_API int sr_dev_info_get(const struct sr_device *device, int id,
                                           const void **data)
 {
        if ((device == NULL) || (device->plugin == NULL))