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

diff --git a/backend.c b/backend.c
index 34771f76ee854b494084e46317d9c55dcc8491a3..b60bce8b6f558c2355499a755faafaddddb19e04 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -28,7 +28,7 @@
  */
 SR_API int sr_init(void)
 {
-       return sr_hwplugins_load();
+       return sr_hw_load_all();
 }
 
 /**
@@ -38,7 +38,7 @@ SR_API int sr_init(void)
  */
 SR_API int sr_exit(void)
 {
-       sr_hwplugins_cleanup();
+       sr_hw_cleanup_all();
 
        return SR_OK;
 }

diff --git a/device.c b/device.c
index 790264acf651c42c26a74811059a44dcec5429ec..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;

diff --git a/hwplugin.c b/hwplugin.c
index 6caa39dba9845c378e1b7265ae192c55d82be729..212ab20c6cae174f944f0c855cca4685d17ff1d4 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -68,7 +68,7 @@ extern struct sr_device_plugin alsa_plugin_info;
 #endif
 
 /* TODO: No linked list needed, this can be a simple array. */
-SR_PRIV int sr_hwplugins_load(void)
+SR_PRIV int sr_hw_load_all(void)
 {
 #ifdef HAVE_LA_DEMO
        plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
@@ -108,7 +108,7 @@ SR_PRIV int sr_hwplugins_load(void)
  *
  * @return A GSList of pointers to loaded plugins.
  */
-SR_API GSList *sr_hwplugins_list(void)
+SR_API GSList *sr_hw_list(void)
 {
 
        return plugins;
@@ -124,7 +124,7 @@ SR_API GSList *sr_hwplugins_list(void)
  *
  * @return The number of devices found and instantiated by the plugin.
  */
-SR_API int sr_hwplugin_init(struct sr_device_plugin *plugin)
+SR_API int sr_hw_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_hwplugin_init(struct sr_device_plugin *plugin)
        return num_initialized_devices;
 }
 
-SR_PRIV void sr_hwplugins_cleanup(void)
+SR_PRIV void sr_hw_cleanup_all(void)
 {
        struct sr_device_plugin *plugin;
        GSList *l;
@@ -272,7 +272,7 @@ SR_PRIV void sr_serial_dev_inst_free(
  *
  * @return TRUE if found, FALSE otherwise.
  */
-SR_API gboolean sr_hwplugin_has_hwcap(struct sr_device_plugin *plugin, int hwcap)
+SR_API gboolean sr_hw_has_hwcap(struct sr_device_plugin *plugin, int hwcap)
 {
        int *capabilities, i;
 
@@ -286,14 +286,14 @@ SR_API gboolean sr_hwplugin_has_hwcap(struct sr_device_plugin *plugin, int hwcap
 }
 
 /**
- * Find a hardware plugin capability option.
+ * Get a hardware plugin capability option.
  *
- * @param hwcap The capability to find
+ * @param hwcap The capability to get.
  *
  * @return A struct with information about the parameter, or NULL
  * if not found.
  */
-SR_API struct sr_hwcap_option *sr_hwplugins_hwcap_get(int hwcap)
+SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
 {
        int i;
 

diff --git a/sigrok-internal.h b/sigrok-internal.h
index 4f4a7389eb62d2c9c9d3e117e8663eef464a4c77..8b9392016a92c8df6e49ef7457b6411f3582bf58 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -77,8 +77,8 @@ SR_PRIV int sr_err(const char *format, ...);
 
 /*--- hwplugin.c ------------------------------------------------------------*/
 
-SR_PRIV int sr_hwplugins_load(void);
-SR_PRIV void sr_hwplugins_cleanup(void);
+SR_PRIV int sr_hw_load_all(void);
+SR_PRIV void sr_hw_cleanup_all(void);
 
 /*--- session.c -------------------------------------------------------------*/
 

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 5c4cfa855d9d3047b9fcbeea06163ffc89c59449..f133b3cc63eda09b50e1250afca6e1b367bea74b 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -72,10 +72,10 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 
 /*--- hwplugin.c ------------------------------------------------------------*/
 
-SR_API GSList *sr_hwplugins_list(void);
-SR_API int sr_hwplugin_init(struct sr_device_plugin *plugin);
-SR_API gboolean sr_hwplugin_has_hwcap(struct sr_device_plugin *plugin, int hwcap);
-SR_API struct sr_hwcap_option *sr_hwplugins_hwcap_get(int hwcap);
+SR_API GSList *sr_hw_list(void);
+SR_API int sr_hw_init(struct sr_device_plugin *plugin);
+SR_API gboolean sr_hw_has_hwcap(struct sr_device_plugin *plugin, int hwcap);
+SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
 
 /*--- session.c -------------------------------------------------------------*/