sr: rename all sr_device_instance_* functions to sr_dev_inst_*

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index 99e4ad573590ae37f4a8b6fd7ea482a46761372a..ab1468265dbb9e8ff2f22663c672591ae66d34cf 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -59,7 +59,7 @@ static struct session_vdevice *get_vdevice_by_index(int device_index)
 
        /* TODO: Sanity checks on device_index. */
 
-       if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+       if (!(sdi = sr_get_dev_inst(device_instances, device_index))) {
                sr_err("session driver: %s: device instance with device "
                       "index %d was not found", __func__, device_index);
                return NULL;
@@ -165,7 +165,7 @@ static int hw_cleanup(void)
        /* TODO: Error handling. */
 
        for (l = device_instances; l; l = l->next)
-               sr_device_instance_free(l->data);
+               sr_dev_inst_free(l->data);
 
        g_slist_free(device_instances);
        device_instances = NULL;
@@ -181,7 +181,7 @@ static int hw_opendev(int device_index)
 {
        struct sr_device_instance *sdi;
 
-       sdi = sr_device_instance_new(device_index, SR_ST_INITIALIZING,
+       sdi = sr_dev_inst_new(device_index, SR_ST_INITIALIZING,
                NULL, NULL, NULL);
        if (!sdi)
                return SR_ERR;