BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename sr_driver_scan_options() to sr_driver_scan_options_list().

This commit is contained in:
Uwe Hermann 2015-12-31 18:47:55 +01:00
parent 0c697a4b33
commit 8141a0325c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/cxx/classes.cpp
View File

@ -408,7 +408,7 @@ string Driver::long_name() const
set<const ConfigKey *> Driver::scan_options() 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; set<const ConfigKey *> result;
for (guint i = 0; i < opts->len; i++) for (guint i = 0; i < opts->len; i++)
result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i))); result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));

2
include/libsigrok/proto.h
View File

@ -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 struct sr_dev_driver **sr_driver_list(const struct sr_context *ctx);
SR_API int sr_driver_init(struct sr_context *ctx, SR_API int sr_driver_init(struct sr_context *ctx,
struct sr_dev_driver *driver); 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 GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
SR_API int sr_config_get(const struct sr_dev_driver *driver, SR_API int sr_config_get(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi, const struct sr_dev_inst *sdi,

4
src/hwdriver.c
View File

@ -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. * 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(). * initialized the driver by calling sr_driver_init().
* *
* @param driver The driver to enumerate options for. This must be a pointer * @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 * @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; GVariant *gvar;
const uint32_t *opts; const uint32_t *opts;