sr_dev_inst_*() -> sr_dev_*()

diff --git a/device.c b/device.c
index 2ad678497421a0247e264374b2f61cc6e5d075a8..e49318e236cd7d48169319761401edc874f206ab 100644 (file)
--- a/device.c
+++ b/device.c
@@ -345,7 +345,7 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
        g_free(serial);
 }
 
-SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
+SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver)
 {
        if (driver && driver->dev_list)
                return driver->dev_list();
@@ -353,7 +353,7 @@ SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
                return NULL;
 }
 
-SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver)
+SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
 {
        if (driver && driver->dev_clear)
                return driver->dev_clear();

diff --git a/proto.h b/proto.h
index 8504bfa4481abae976d2656165c91f7d524d1140..28cbe844e4353cef28db60fc33c23d77e84ac0ea 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -52,8 +52,8 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum,
 SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
                const char *trigger);
 SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
-SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver);
-SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver);
+SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver);
+SR_API int sr_dev_clear(const struct sr_dev_driver *driver);
 
 /*--- filter.c --------------------------------------------------------------*/