sr: rename hwplugin functions to sr_thing_action format

diff --git a/backend.c b/backend.c
index 6fc1082949272eac0b4c52b2045d5364241b017f..308041ef4e583106d30cb37af4c33fafb12dc165 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -38,7 +38,7 @@ SR_API int sr_init(void)
  */
 SR_API int sr_exit(void)
 {
-       sr_cleanup_hwplugins();
+       sr_hwplugins_cleanup();
 
        return SR_OK;
 }

diff --git a/device.c b/device.c
index 2713e68f2b6d9afa4f7416d7a7894ec639005a55..d504f8b5cc883253e447a0e75b47758ce7f991c5 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_list_hwplugins())) {
+       if (!(plugins = sr_hwplugins_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_init_hwplugin(plugin);
+               sr_hwplugin_init(plugin);
        }
 
        return SR_OK;

diff --git a/hwplugin.c b/hwplugin.c
index 4ad7502b7705068ec241f4ce5c37696944f2e862..8d08e342b703a317358babe8c122704882b7ce7a 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -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;
@@ -154,7 +154,7 @@ SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin)
        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;

diff --git a/sigrok-internal.h b/sigrok-internal.h
index a233a28fe2dfe3017335be3ebfc2f16f9f9ee613..a11d85ac33d2aada60a9c48c9576ad2316bac770 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -78,7 +78,7 @@ SR_PRIV int sr_err(const char *format, ...);
 /*--- hwplugin.c ------------------------------------------------------------*/
 
 SR_PRIV int load_hwplugins(void);
-SR_PRIV void sr_cleanup_hwplugins(void);
+SR_PRIV void sr_hwplugins_cleanup(void);
 
 /*--- session.c -------------------------------------------------------------*/
 

diff --git a/sigrok-proto.h b/sigrok-proto.h
index bb32fc7e15865010cda2456f47950afb370158ca..fd6bcd0a8f5f8e98003767194e8df4fa035f9ef9 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -72,8 +72,8 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 
 /*--- hwplugin.c ------------------------------------------------------------*/
 
-SR_API GSList *sr_list_hwplugins(void);
-SR_API int sr_init_hwplugin(struct sr_device_plugin *plugin);
+SR_API GSList *sr_hwplugins_list(void);
+SR_API int sr_hwplugin_init(struct sr_device_plugin *plugin);
 SR_API gboolean sr_has_hwcap(int *capabilities, int hwcap);
 SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);