From: Bert Vermeulen Date: Fri, 25 Jan 2013 14:48:44 +0000 (+0100) Subject: Rename sr_info_get() to sr_config_get(). X-Git-Tag: dsupstream~305 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ddd9b41f5af2c5f1719439546a378d91ceef6c30;p=libsigrok.git Rename sr_info_get() to sr_config_get(). --- diff --git a/hwdriver.c b/hwdriver.c index b4136103..100063d8 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -316,7 +316,7 @@ SR_PRIV struct sr_config *sr_config_make(int key, const void *value) * but this is not to be flagged as an error by the caller; merely * as an indication that it's not applicable. */ -SR_API int sr_info_get(struct sr_dev_driver *driver, int id, +SR_API int sr_config_get(struct sr_dev_driver *driver, int id, const void **data, const struct sr_dev_inst *sdi) { int ret; diff --git a/proto.h b/proto.h index 12bbbeaf..fef52f8e 100644 --- a/proto.h +++ b/proto.h @@ -70,7 +70,7 @@ SR_API struct sr_dev_driver **sr_driver_list(void); SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver); SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options); -SR_API int sr_info_get(struct sr_dev_driver *driver, int id, +SR_API int sr_config_get(struct sr_dev_driver *driver, int id, const void **data, const struct sr_dev_inst *sdi); SR_API int sr_config_list(struct sr_dev_driver *driver, int id, const void **data, const struct sr_dev_inst *sdi); diff --git a/session_file.c b/session_file.c index 53e6d1e6..0a5979e4 100644 --- a/session_file.c +++ b/session_file.c @@ -254,7 +254,7 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi, fprintf(meta, "unitsize = %d\n", unitsize); fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes)); if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) { - if (sr_info_get(sdi->driver, SR_CONF_SAMPLERATE, + if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, (const void **)&samplerate, sdi) == SR_OK) { s = sr_samplerate_string(*samplerate); fprintf(meta, "samplerate = %s\n", s);