X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=fa2305f0f98b675c86e744f86b062d978f5b0652;hp=4cdf7049da05e51809ba1f4277560fac5b33b55d;hb=d75c85291a61a6d83386de95cff6ad279e853ebd;hpb=50c641aab7c4400393b7d2ab6be9267e3fa1eac7 diff --git a/show.c b/show.c index 4cdf704..fa2305f 100644 --- a/show.c +++ b/show.c @@ -21,21 +21,16 @@ #include #include -extern gint opt_loglevel; -extern gchar *opt_pds; - static gint sort_inputs(gconstpointer a, gconstpointer b) { - const struct sr_input_format *ia = a, *ib = b; - - return strcmp(ia->id, ib->id); + return strcmp(sr_input_id_get((struct sr_input_module *)a), + sr_input_id_get((struct sr_input_module *)b)); } static gint sort_outputs(gconstpointer a, gconstpointer b) { - const struct sr_output_format *oa = a, *ob = b; - - return strcmp(oa->id, ob->id); + return strcmp(sr_output_id_get((struct sr_output_module *)a), + sr_output_id_get((struct sr_output_module *)b)); } static gint sort_drivers(gconstpointer a, gconstpointer b) @@ -57,8 +52,8 @@ static gint sort_pds(gconstpointer a, gconstpointer b) void show_version(void) { struct sr_dev_driver **drivers, *driver; - struct sr_input_format **inputs, *input; - struct sr_output_format **outputs, *output; + const struct sr_input_module **inputs, *input; + const struct sr_output_module **outputs, *output; const GSList *l; GSList *sl; int i; @@ -90,11 +85,12 @@ void show_version(void) printf("Supported input formats:\n"); inputs = sr_input_list(); for (sl = NULL, i = 0; inputs[i]; i++) - sl = g_slist_append(sl, inputs[i]); + sl = g_slist_append(sl, (gpointer)inputs[i]); sl = g_slist_sort(sl, sort_inputs); for (l = sl; l; l = l->next) { input = l->data; - printf(" %-20s %s\n", input->id, input->description); + printf(" %-20s %s\n", sr_input_id_get(input), + sr_input_description_get(input)); } printf("\n"); g_slist_free(sl); @@ -102,11 +98,12 @@ void show_version(void) printf("Supported output formats:\n"); outputs = sr_output_list(); for (sl = NULL, i = 0; outputs[i]; i++) - sl = g_slist_append(sl, outputs[i]); + sl = g_slist_append(sl, (gpointer)outputs[i]); sl = g_slist_sort(sl, sort_outputs); for (l = sl; l; l = l->next) { output = l->data; - printf(" %-20s %s\n", output->id, output->description); + printf(" %-20s %s\n", sr_output_id_get(output), + sr_output_description_get(output)); } printf("\n"); g_slist_free(sl); @@ -196,8 +193,47 @@ void show_dev_list(void) } +void show_drv_detail(struct sr_dev_driver *driver) +{ + const struct sr_config_info *srci; + GVariant *gvar_opts; + const uint32_t *opts; + gsize num_elements, i; + + if ((sr_config_list(driver, NULL, NULL, SR_CONF_DEVICE_OPTIONS, + &gvar_opts) == SR_OK)) { + opts = g_variant_get_fixed_array(gvar_opts, &num_elements, + sizeof(uint32_t)); + if (num_elements) { + printf("Driver functions:\n"); + for (i = 0; i < num_elements; i++) { + if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK))) + continue; + printf(" %s\n", srci->name); + } + } + g_variant_unref(gvar_opts); + } + + if ((sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS, + &gvar_opts) == SR_OK)) { + opts = g_variant_get_fixed_array(gvar_opts, &num_elements, + sizeof(uint32_t)); + if (num_elements) { + printf("Scan options:\n"); + for (i = 0; i < num_elements; i++) { + if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK))) + continue; + printf(" %s\n", srci->id); + } + } + g_variant_unref(gvar_opts); + } +} + void show_dev_detail(void) { + struct sr_dev_driver *driver; struct sr_dev_inst *sdi; const struct sr_config_info *srci; struct sr_channel *ch; @@ -207,13 +243,19 @@ void show_dev_detail(void) 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 (parse_driver(opt_drv, &driver, NULL)) { + /* A driver was specified, report driver-wide options now. */ + show_drv_detail(driver); + } + if (!(devices = device_scan())) { g_critical("No devices found."); return; @@ -227,6 +269,7 @@ void show_dev_detail(void) } sdi = devices->data; + g_slist_free(devices); print_dev_line(sdi); if (sr_dev_open(sdi) != SR_OK) { @@ -234,19 +277,6 @@ void show_dev_detail(void) return; } - if ((sr_config_list(sdi->driver, NULL, NULL, SR_CONF_SCAN_OPTIONS, - &gvar_opts) == SR_OK)) { - opts = g_variant_get_fixed_array(gvar_opts, &num_elements, - sizeof(int32_t)); - printf("Supported driver options:\n"); - for (i = 0; i < num_elements; i++) { - if (!(srci = sr_config_info_get(opts[i]))) - continue; - printf(" %s\n", srci->id); - } - g_variant_unref(gvar_opts); - } - /* Selected channels and channel group may affect which options are * returned, or which values for them. */ select_channels(sdi); @@ -279,13 +309,14 @@ void show_dev_detail(void) 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; @@ -326,14 +357,14 @@ void show_dev_detail(void) 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; } @@ -341,7 +372,7 @@ void show_dev_detail(void) 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, @@ -384,71 +415,52 @@ void show_dev_detail(void) } 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; } @@ -467,13 +479,13 @@ void show_dev_detail(void) } 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 { @@ -497,7 +509,7 @@ void show_dev_detail(void) } 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"); @@ -509,13 +521,13 @@ void show_dev_detail(void) } 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 { @@ -537,6 +549,47 @@ void show_dev_detail(void) 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 */ @@ -546,19 +599,19 @@ void show_dev_detail(void) g_variant_unref(gvar_opts); sr_dev_close(sdi); - g_slist_free(devices); } #ifdef HAVE_SRD void show_pd_detail(void) { - GSList *l, *ll, *ol; struct srd_decoder *dec; struct srd_decoder_option *o; - char **pdtokens, **pdtok, *optsep, **ann, *val, *doc; struct srd_channel *pdch; struct srd_decoder_annotation_row *r; + GSList *l, *ll, *ol; + int idx; + char **pdtokens, **pdtok, *optsep, **ann, *val, *doc; pdtokens = g_strsplit(opt_pds, ",", -1); for (pdtok = pdtokens; *pdtok; pdtok++) { @@ -586,8 +639,13 @@ void show_pd_detail(void) for (l = dec->annotation_rows; l; l = l->next) { r = l->data; printf("- %s (%s): ", r->id, r->desc); - for (ll = r->ann_classes; ll; ll = ll->next) - printf("%d ", GPOINTER_TO_INT(ll->data)); + for (ll = r->ann_classes; ll; ll = ll->next) { + idx = GPOINTER_TO_INT(ll->data); + ann = g_slist_nth_data(dec->annotations, idx); + printf("%s", ann[0]); + if (ll->next) + printf(", "); + } printf("\n"); } } else { @@ -641,3 +699,83 @@ void show_pd_detail(void) } #endif +void show_input(void) +{ + const struct sr_input_module *imod; + const struct sr_option **opts; + GSList *l; + int i; + char *s, **tok; + + tok = g_strsplit(opt_input_format, ":", 0); + if (!tok[0] || !(imod = sr_input_find(tok[0]))) + g_critical("Input module '%s' not found.", opt_input_format); + + printf("ID: %s\nName: %s\n", sr_input_id_get(imod), + sr_input_name_get(imod)); + printf("Description: %s\n", sr_input_description_get(imod)); + if ((opts = sr_input_options_get(imod))) { + printf("Options:\n"); + for (i = 0; opts[i]; i++) { + printf(" %s: %s", opts[i]->id, opts[i]->desc); + if (opts[i]->def) { + s = g_variant_print(opts[i]->def, FALSE); + printf(" (default %s", s); + g_free(s); + if (opts[i]->values) { + printf(", possible values "); + for (l = opts[i]->values; l; l = l->next) { + s = g_variant_print((GVariant *)l->data, FALSE); + printf("%s%s", s, l->next ? ", " : ""); + g_free(s); + } + } + printf(")"); + } + printf("\n"); + } + sr_input_options_free(opts); + } + g_strfreev(tok); +} + +void show_output(void) +{ + const struct sr_output_module *omod; + const struct sr_option **opts; + GSList *l; + int i; + char *s, **tok; + + tok = g_strsplit(opt_output_format, ":", 0); + if (!tok[0] || !(omod = sr_output_find(tok[0]))) + g_critical("Output module '%s' not found.", opt_output_format); + + printf("ID: %s\nName: %s\n", sr_output_id_get(omod), + sr_output_name_get(omod)); + printf("Description: %s\n", sr_output_description_get(omod)); + if ((opts = sr_output_options_get(omod))) { + printf("Options:\n"); + for (i = 0; opts[i]; i++) { + printf(" %s: %s", opts[i]->id, opts[i]->desc); + if (opts[i]->def) { + s = g_variant_print(opts[i]->def, FALSE); + printf(" (default %s", s); + g_free(s); + if (opts[i]->values) { + printf(", possible values "); + for (l = opts[i]->values; l; l = l->next) { + s = g_variant_print((GVariant *)l->data, FALSE); + printf("%s%s", s, l->next ? ", " : ""); + g_free(s); + } + } + printf(")"); + } + printf("\n"); + } + sr_output_options_free(opts); + } + g_strfreev(tok); +} +