From: Bert Vermeulen <redacted>
Date: Mon, 22 Apr 2013 13:55:06 +0000 (+0200)
Subject: sr_dev_inst_*() -> sr_dev_*()
X-Git-Tag: dsupstream~83
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=f99e32affc3a18a2a6b45c988bc440013a8b2e4e

sr_dev_inst_*() -> sr_dev_*()
---

diff --git a/device.c b/device.c
index 2ad67849..e49318e2 100644
--- 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 8504bfa4..28cbe844 100644
--- 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 --------------------------------------------------------------*/