sr: rename hwplugin functions to sr_thing_action format

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index dfee3814bd32e4ce6533db4fc052b04fa5d42b71..8d08e342b703a317358babe8c122704882b7ce7a 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@ SR_PRIV int load_hwplugins(void)
  *
  * @return A GSList of pointers to loaded plugins.
  */
-SR_API GSList *sr_list_hwplugins(void)
+SR_API GSList *sr_hwplugins_list(void)
 {
 
        return plugins;
@@ -124,7 +124,7 @@ SR_API GSList *sr_list_hwplugins(void)
  *
  * @return The number of devices found and instantiated by the plugin.
  */
-SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin)
+SR_API int sr_hwplugin_init(struct sr_device_plugin *plugin)
 {
        int num_devices, num_probes, i, j;
        int num_initialized_devices = 0;
@@ -145,16 +145,16 @@ SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin)
                        continue;
                }
 
-               device = sr_device_new(plugin, i);
+               device = sr_dev_new(plugin, i);
                for (j = 0; j < num_probes; j++)
-                       sr_device_probe_add(device, probe_names[j]);
+                       sr_dev_probe_add(device, probe_names[j]);
                num_initialized_devices++;
        }
 
        return num_initialized_devices;
 }
 
-SR_PRIV void sr_cleanup_hwplugins(void)
+SR_PRIV void sr_hwplugins_cleanup(void)
 {
        struct sr_device_plugin *plugin;
        GSList *l;