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

[libsigrok.git] / hardware / asix-sigma / asix-sigma.c

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index ea071dc7636aa72c3335a1a90c0ee3c4ebabc0b4..5aed8756d09f97d43be6f9979abcc6e17d055c10 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -559,7 +559,7 @@ static int hw_opendev(int device_index)
        struct sigma *sigma;
        int ret;
 
-       if (!(sdi = sr_get_dev_inst(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
                return SR_ERR;
 
        sigma = sdi->priv;
@@ -702,7 +702,7 @@ static int hw_closedev(int device_index)
        struct sr_device_instance *sdi;
        struct sigma *sigma;
 
-       if (!(sdi = sr_get_dev_inst(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
                sr_err("sigma: %s: sdi was NULL", __func__);
                return SR_ERR; /* TODO: SR_ERR_ARG? */
        }
@@ -735,7 +735,6 @@ static int hw_cleanup(void)
                        ret = SR_ERR_BUG;
                        continue;
                }
-               g_free(sdi->priv);
                sr_dev_inst_free(sdi);
        }
        g_slist_free(device_instances);
@@ -750,7 +749,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
        struct sigma *sigma;
        void *info = NULL;
 
-       if (!(sdi = sr_get_dev_inst(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
                sr_err("It's NULL.\n");
                return NULL;
        }
@@ -785,7 +784,7 @@ static int hw_get_status(int device_index)
 {
        struct sr_device_instance *sdi;
 
-       sdi = sr_get_dev_inst(device_instances, device_index);
+       sdi = sr_dev_inst_get(device_instances, device_index);
        if (sdi)
                return sdi->status;
        else
@@ -803,7 +802,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        struct sigma *sigma;
        int ret;
 
-       if (!(sdi = sr_get_dev_inst(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
                return SR_ERR;
 
        sigma = sdi->priv;
@@ -1267,7 +1266,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
        /* Avoid compiler warnings. */
        (void)session_data;
 
-       if (!(sdi = sr_get_dev_inst(device_instances, device_index)))
+       if (!(sdi = sr_dev_inst_get(device_instances, device_index)))
                return SR_ERR;
 
        sigma = sdi->priv;
@@ -1378,7 +1377,7 @@ static int hw_stop_acquisition(int device_index, gpointer session_data)
        /* Avoid compiler warnings. */
        (void)session_data;
 
-       if (!(sdi = sr_get_dev_inst(device_instances, device_index))) {
+       if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
                sr_err("asix: %s: sdi was NULL", __func__);
                return SR_ERR_BUG;
        }