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

Rename sr_dev_has_hwcap() to sr_dev_has_option().

This commit is contained in:
Bert Vermeulen 2013-01-25 16:20:40 +01:00
parent 6a4710fac2
commit 4d15e5c907
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
device.c
View File

@ -183,27 +183,27 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
* If the device's 'driver' field is NULL (virtual device), this * If the device's 'driver' field is NULL (virtual device), this
* function will always return FALSE (virtual devices don't have * function will always return FALSE (virtual devices don't have
* a hardware capabilities list). * a hardware capabilities list).
* @param hwcap The capability that should be checked (whether it's supported * @param option The option that should be checked for support on the
* by the specified device). * specified device.
* *
* @return TRUE if the device has the specified capability, FALSE otherwise. * @return TRUE if the device has the specified option, FALSE otherwise.
* FALSE is also returned upon invalid input parameters or other * FALSE is also returned on invalid input parameters or other
* error conditions. * error conditions.
*/ */
SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap) SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
{ {
const int *hwcaps; const int *devopts;
int i; int i;
if (!sdi || !sdi->driver) if (!sdi || !sdi->driver)
return FALSE; return FALSE;
if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS, if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS,
(const void **)&hwcaps, NULL) != SR_OK) (const void **)&devopts, NULL) != SR_OK)
return FALSE; return FALSE;
for (i = 0; hwcaps[i]; i++) { for (i = 0; devopts[i]; i++) {
if (hwcaps[i] == hwcap) if (devopts[i] == key)
return TRUE; return TRUE;
} }

2
output/chronovu_la8.c
View File

@ -128,7 +128,7 @@ static int init(struct sr_output *o)
ctx->probelist[ctx->num_enabled_probes] = 0; ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8; ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
if (sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) { if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
o->sdi->driver->config_get(SR_CONF_SAMPLERATE, o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
(const void **)&samplerate, o->sdi); (const void **)&samplerate, o->sdi);
ctx->samplerate = *samplerate; ctx->samplerate = *samplerate;

2
output/csv.c
View File

@ -99,7 +99,7 @@ static int init(struct sr_output *o)
num_probes = g_slist_length(o->sdi->probes); num_probes = g_slist_length(o->sdi->probes);
if (sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) { if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
o->sdi->driver->config_get(SR_CONF_SAMPLERATE, o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
(const void **)&samplerate, o->sdi); (const void **)&samplerate, o->sdi);
ctx->samplerate = *samplerate; ctx->samplerate = *samplerate;

2
output/gnuplot.c
View File

@ -109,7 +109,7 @@ static int init(struct sr_output *o)
num_probes = g_slist_length(o->sdi->probes); num_probes = g_slist_length(o->sdi->probes);
comment[0] = '\0'; comment[0] = '\0';
if (sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) { if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
o->sdi->driver->config_get(SR_CONF_SAMPLERATE, o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
(const void **)&samplerate, o->sdi); (const void **)&samplerate, o->sdi);
if (!(frequency_s = sr_samplerate_string(*samplerate))) { if (!(frequency_s = sr_samplerate_string(*samplerate))) {

2
output/ols.c
View File

@ -69,7 +69,7 @@ static int init(struct sr_output *o)
} }
ctx->unitsize = (num_enabled_probes + 7) / 8; ctx->unitsize = (num_enabled_probes + 7) / 8;
if (o->sdi->driver && sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE))
o->sdi->driver->config_get(SR_CONF_SAMPLERATE, o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
(const void **)&samplerate, o->sdi); (const void **)&samplerate, o->sdi);
else { else {

2
output/text/text.c
View File

@ -123,7 +123,7 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING); snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->sdi->probes); num_probes = g_slist_length(o->sdi->probes);
if (o->sdi->driver || sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) { if (o->sdi->driver || sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
ret = o->sdi->driver->config_get(SR_CONF_SAMPLERATE, ret = o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
(const void **)&samplerate, o->sdi); (const void **)&samplerate, o->sdi);
if (ret != SR_OK) if (ret != SR_OK)

2
output/vcd.c
View File

@ -94,7 +94,7 @@ static int init(struct sr_output *o)
g_string_append_printf(ctx->header, "$version %s %s $end\n", g_string_append_printf(ctx->header, "$version %s %s $end\n",
PACKAGE, PACKAGE_VERSION); PACKAGE, PACKAGE_VERSION);
if (o->sdi->driver && sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) { if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
o->sdi->driver->config_get(SR_CONF_SAMPLERATE, o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
(const void **)&samplerate, o->sdi); (const void **)&samplerate, o->sdi);
ctx->samplerate = *samplerate; ctx->samplerate = *samplerate;

2
proto.h
View File

@ -51,7 +51,7 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum,
gboolean state); gboolean state);
SR_API int sr_dev_trigger_set(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); const char *trigger);
SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap); SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
SR_API int sr_config_set(const struct sr_dev_inst *sdi, int hwcap, SR_API int sr_config_set(const struct sr_dev_inst *sdi, int hwcap,
const void *value); const void *value);
SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver); SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver);

2
session_file.c
View File

@ -253,7 +253,7 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
fprintf(meta, "capturefile = logic-1\n"); fprintf(meta, "capturefile = logic-1\n");
fprintf(meta, "unitsize = %d\n", unitsize); fprintf(meta, "unitsize = %d\n", unitsize);
fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes)); fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes));
if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) { if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
(const void **)&samplerate, sdi) == SR_OK) { (const void **)&samplerate, sdi) == SR_OK) {
s = sr_samplerate_string(*samplerate); s = sr_samplerate_string(*samplerate);