gsize num_opts, num_elements;
double dlow, dhigh, dcur_low, dcur_high;
const uint64_t *uint64, p, q, low, high;
- uint64_t cur_low, cur_high;
- const int32_t *int32, *opts;
- unsigned int num_devices, o, i;
- char *tmp_str;
- char *s, c;
+ uint64_t tmp_uint64, cur_low, cur_high, cur_p, cur_q;
+ const uint32_t *opts;
+ const int32_t *int32;
+ uint32_t key, o;
+ unsigned int num_devices, i;
+ char *tmp_str, *s, c;
const char **stropts;
if (!(devices = device_scan())) {
printf(" on channel group %s", channel_group->name);
}
printf(":\n");
- opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(int32_t));
+ opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
for (o = 0; o < num_opts; o++) {
- if (!(srci = sr_config_info_get(opts[o])))
+ key = opts[o] & SR_CONF_MASK;
+ if (!(srci = sr_config_info_get(key)))
continue;
- if (srci->key == SR_CONF_TRIGGER_MATCH) {
- if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
+ if (key == SR_CONF_TRIGGER_MATCH) {
+ if (sr_config_list(sdi->driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
printf("\n");
g_variant_unref(gvar_list);
- } else if (srci->key == SR_CONF_LIMIT_SAMPLES) {
+ } else if (key == SR_CONF_LIMIT_SAMPLES) {
/* If implemented in config_list(), this denotes the
* maximum number of samples a device can send. This
* really applies only to logic analyzers, and then
* only to those that don't support compression, or
* have it turned off by default. The values returned
* are the low/high limits. */
- if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
+ if (sr_config_list(sdi->driver, sdi, channel_group, key,
&gvar) != SR_OK) {
continue;
}
g_variant_unref(gvar);
printf(" Maximum number of samples: %"PRIu64"\n", high);
- } else if (srci->key == SR_CONF_SAMPLERATE) {
+ } else if (key == SR_CONF_SAMPLERATE) {
/* Supported samplerates */
printf(" %s", srci->id);
if (sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_SAMPLERATE,
}
g_variant_unref(gvar_dict);
- } else if (srci->key == SR_CONF_BUFFERSIZE) {
- /* Supported buffer sizes */
+ } else if (srci->datatype == SR_T_UINT64) {
printf(" %s", srci->id);
+ gvar = NULL;
+ if (sr_config_get(sdi->driver, sdi, channel_group, key,
+ &gvar) == SR_OK) {
+ tmp_uint64 = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ } else
+ tmp_uint64 = 0;
if (sr_config_list(sdi->driver, sdi, channel_group,
SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
+ if (gvar) {
+ /* Can't list it, but we have a value to show. */
+ printf("%"PRIu64" (current)", tmp_uint64);
+ }
printf("\n");
continue;
}
uint64 = g_variant_get_fixed_array(gvar_list,
&num_elements, sizeof(uint64_t));
- printf(" - supported buffer sizes:\n");
- for (i = 0; i < num_elements; i++)
- printf(" %"PRIu64"\n", uint64[i]);
- g_variant_unref(gvar_list);
-
- } else if (srci->key == SR_CONF_TIMEBASE) {
- /* Supported time bases */
- printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, sdi, channel_group,
- SR_CONF_TIMEBASE, &gvar_list) != SR_OK) {
- printf("\n");
- continue;
- }
- printf(" - supported time bases:\n");
- num_elements = g_variant_n_children(gvar_list);
+ printf(" - supported values:\n");
for (i = 0; i < num_elements; i++) {
- gvar = g_variant_get_child_value(gvar_list, i);
- g_variant_get(gvar, "(tt)", &p, &q);
- s = sr_period_string(p * q);
- printf(" %s\n", s);
- g_free(s);
- }
- g_variant_unref(gvar_list);
-
- } else if (srci->key == SR_CONF_VDIV) {
- /* Supported volts/div values */
- printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, sdi, channel_group,
- SR_CONF_VDIV, &gvar_list) != SR_OK) {
+ printf(" %"PRIu64, uint64[i]);
+ if (gvar && tmp_uint64 == uint64[i])
+ printf(" (current)");
printf("\n");
- continue;
- }
- printf(" - supported volts/div:\n");
- num_elements = g_variant_n_children(gvar_list);
- for (i = 0; i < num_elements; i++) {
- gvar = g_variant_get_child_value(gvar_list, i);
- g_variant_get(gvar, "(tt)", &p, &q);
- s = sr_voltage_string(p, q);
- printf(" %s\n", s);
- g_free(s);
}
g_variant_unref(gvar_list);
} else if (srci->datatype == SR_T_STRING) {
printf(" %s: ", srci->id);
- if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
+ if (sr_config_get(sdi->driver, sdi, channel_group, key,
&gvar) == SR_OK) {
tmp_str = g_strdup(g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
} else
tmp_str = NULL;
- if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
+ if (sr_config_list(sdi->driver, sdi, channel_group, key,
&gvar) != SR_OK) {
+ if (tmp_str) {
+ /* Can't list it, but we have a value to show. */
+ printf("%s (current)", tmp_str);
+ }
printf("\n");
+ g_free(tmp_str);
continue;
}
} else if (srci->datatype == SR_T_UINT64_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
+ if (sr_config_list(sdi->driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
}
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+ if (sr_config_get(sdi->driver, sdi, channel_group, key, &gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &cur_low, &cur_high);
g_variant_unref(gvar);
} else {
} else if (srci->datatype == SR_T_BOOL) {
printf(" %s: ", srci->id);
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key,
+ if (sr_config_get(sdi->driver, sdi, channel_group, key,
&gvar) == SR_OK) {
if (g_variant_get_boolean(gvar))
printf("on (current), off\n");
} else if (srci->datatype == SR_T_DOUBLE_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
+ if (sr_config_list(sdi->driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
}
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+ if (sr_config_get(sdi->driver, sdi, channel_group, key, &gvar) == SR_OK) {
g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
g_variant_unref(gvar);
} else {
printf("\n");
g_variant_unref(gvar_list);
+ } else if (srci->datatype == SR_T_FLOAT) {
+ printf(" %s: ", srci->id);
+ if (sr_config_get(sdi->driver, sdi, channel_group, key,
+ &gvar) == SR_OK) {
+ printf("%f\n", g_variant_get_double(gvar));
+ g_variant_unref(gvar);
+ } else
+ printf("\n");
+
+ } else if (srci->datatype == SR_T_RATIONAL_PERIOD
+ || srci->datatype == SR_T_RATIONAL_VOLT) {
+ printf(" %s", srci->id);
+ if (sr_config_get(sdi->driver, sdi, channel_group, key,
+ &gvar) == SR_OK) {
+ g_variant_get(gvar, "(tt)", &cur_p, &cur_q);
+ g_variant_unref(gvar);
+ } else
+ cur_p = cur_q = 0;
+
+ if (sr_config_list(sdi->driver, sdi, channel_group,
+ key, &gvar_list) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported values:\n");
+ num_elements = g_variant_n_children(gvar_list);
+ for (i = 0; i < num_elements; i++) {
+ gvar = g_variant_get_child_value(gvar_list, i);
+ g_variant_get(gvar, "(tt)", &p, &q);
+ if (srci->datatype == SR_T_RATIONAL_PERIOD)
+ s = sr_period_string(p * q);
+ else
+ s = sr_voltage_string(p, q);
+ printf(" %s", s);
+ g_free(s);
+ if (p == cur_p && q == cur_q)
+ printf(" (current)");
+ printf("\n");
+ }
+ g_variant_unref(gvar_list);
+
} else {
/* Everything else */
projects / sigrok-cli.git / blobdiff