Rename sr_driver_scan_options() to sr_driver_scan_options_list().

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index eabe36a38654f65e7710f4cfeb10cfb6482ff165..3be1d99477d45818bd94598ff7a3b5391ff5599a 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -408,7 +408,7 @@ string Driver::long_name() const
 
 set<const ConfigKey *> Driver::scan_options() const
 {
-       GArray *opts = sr_driver_scan_options(_structure);
+       GArray *opts = sr_driver_scan_options_list(_structure);
        set<const ConfigKey *> result;
        for (guint i = 0; i < opts->len; i++)
                result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 3a8e346f087c6c8f86b290c9d30139cbefa9d462..c10f7c10dfbf9332fccb9523ed43ead25243de3f 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -83,7 +83,7 @@ SR_API int sr_dev_inst_channel_add(struct sr_dev_inst *sdi, int index, int type,
 SR_API struct sr_dev_driver **sr_driver_list(const struct sr_context *ctx);
 SR_API int sr_driver_init(struct sr_context *ctx,
                struct sr_dev_driver *driver);
-SR_API GArray *sr_driver_scan_options(const struct sr_dev_driver *driver);
+SR_API GArray *sr_driver_scan_options_list(const struct sr_dev_driver *driver);
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
 SR_API int sr_config_get(const struct sr_dev_driver *driver,
                const struct sr_dev_inst *sdi,

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 0aa7eb8c0f0517bf44dee0c30c964bdc679fcfe9..5790e320564fc5d8017d17f601f1be6581b4ea56 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -391,7 +391,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 /**
  * Enumerate scan options supported by this driver.
  *
- * Before calling sr_driver_scan_options(), the user must have previously
+ * Before calling sr_driver_scan_options_list(), the user must have previously
  * initialized the driver by calling sr_driver_init().
  *
  * @param driver The driver to enumerate options for. This must be a pointer
@@ -404,7 +404,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
  *
  * @since 0.4.0
  */
-SR_API GArray *sr_driver_scan_options(const struct sr_dev_driver *driver)
+SR_API GArray *sr_driver_scan_options_list(const struct sr_dev_driver *driver)
 {
        GVariant *gvar;
        const uint32_t *opts;