X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=3bda15857377cb9f4c7546a08001eb9f6d797eec;hp=aaf0c3633530777cdd0a62178c7fa0f2297838f8;hb=48f71481bfa1011fd5c1538a0a8d467e0fe615a8;hpb=478a782d1c7aa2da82e144671dc9feb89729b333 diff --git a/sigrok-cli.c b/sigrok-cli.c index aaf0c36..3bda158 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -39,6 +39,7 @@ extern struct sr_hwcap_option sr_hwcap_options[]; static uint64_t limit_samples = 0; +static uint64_t limit_frames = 0; static struct sr_output_format *output_format = NULL; static int default_output_format = FALSE; static char *output_format_param = NULL; @@ -61,13 +62,14 @@ static gchar *opt_input_format = NULL; static gchar *opt_output_format = NULL; static gchar *opt_time = NULL; static gchar *opt_samples = NULL; +static gchar *opt_frames = NULL; static gchar *opt_continuous = NULL; static GOptionEntry optargs[] = { {"version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, "Show version and support list", NULL}, {"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel, - "Select libsigrok/libsigrokdecode loglevel", NULL}, + "Set libsigrok/libsigrokdecode loglevel", NULL}, {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs, "Scan for devices", NULL}, {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev, @@ -96,6 +98,8 @@ static GOptionEntry optargs[] = { "How long to sample (ms)", NULL}, {"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples, "Number of samples to acquire", NULL}, + {"frames", 0, 0, G_OPTION_ARG_STRING, &opt_frames, + "Number of frames to acquire", NULL}, {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous, "Sample continuously", NULL}, {NULL, 0, 0, 0, NULL, NULL, NULL} @@ -200,9 +204,12 @@ static void show_dev_list(void) static void show_dev_detail(void) { struct sr_dev *dev; - struct sr_hwcap_option *hwo; + const struct sr_hwcap_option *hwo; const struct sr_samplerates *samplerates; - int cap, *hwcaps, i; + struct sr_rational *rationals; + uint64_t *integers; + const int *hwcaps; + int cap, i; char *s, *title; const char *charopts, **stropts; @@ -236,6 +243,7 @@ static void show_dev_detail(void) } if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) { + /* Pattern generator modes */ printf(" %s", hwo->shortname); if (sr_dev_info_get(dev, SR_DI_PATTERNS, (const void **)&stropts) == SR_OK) { @@ -245,15 +253,15 @@ static void show_dev_detail(void) } else { printf("\n"); } + } else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) { - printf(" %s", hwo->shortname); /* Supported samplerates */ + printf(" %s", hwo->shortname); if (sr_dev_info_get(dev, SR_DI_SAMPLERATES, (const void **)&samplerates) != SR_OK) { printf("\n"); continue; } - if (samplerates->step) { /* low */ if (!(s = sr_samplerate_string(samplerates->low))) @@ -272,11 +280,85 @@ static void show_dev_detail(void) g_free(s); } else { printf(" - supported samplerates:\n"); - for (i = 0; samplerates->list[i]; i++) { + for (i = 0; samplerates->list[i]; i++) printf(" %s\n", sr_samplerate_string(samplerates->list[i])); - } } + + } else if (hwo->hwcap == SR_HWCAP_BUFFERSIZE) { + /* Supported buffer sizes */ + printf(" %s", hwo->shortname); + if (sr_dev_info_get(dev, SR_DI_BUFFERSIZES, + (const void **)&integers) != SR_OK) { + printf("\n"); + continue; + } + printf(" - supported buffer sizes:\n"); + for (i = 0; integers[i]; i++) + printf(" %"PRIu64"\n", integers[i]); + + } else if (hwo->hwcap == SR_HWCAP_TIMEBASE) { + /* Supported time bases */ + printf(" %s", hwo->shortname); + if (sr_dev_info_get(dev, SR_DI_TIMEBASES, + (const void **)&rationals) != SR_OK) { + printf("\n"); + continue; + } + printf(" - supported time bases:\n"); + for (i = 0; rationals[i].p && rationals[i].q; i++) + printf(" %s\n", sr_period_string( + rationals[i].p * rationals[i].q)); + + } else if (hwo->hwcap == SR_HWCAP_TRIGGER_SOURCE) { + /* Supported trigger sources */ + printf(" %s", hwo->shortname); + if (sr_dev_info_get(dev, SR_DI_TRIGGER_SOURCES, + (const void **)&stropts) != SR_OK) { + printf("\n"); + continue; + } + printf(" - supported trigger sources:\n"); + for (i = 0; stropts[i]; i++) + printf(" %s\n", stropts[i]); + + } else if (hwo->hwcap == SR_HWCAP_FILTER) { + /* Supported trigger sources */ + printf(" %s", hwo->shortname); + if (sr_dev_info_get(dev, SR_DI_FILTERS, + (const void **)&stropts) != SR_OK) { + printf("\n"); + continue; + } + printf(" - supported filter targets:\n"); + for (i = 0; stropts[i]; i++) + printf(" %s\n", stropts[i]); + + } else if (hwo->hwcap == SR_HWCAP_VDIV) { + /* Supported volts/div values */ + printf(" %s", hwo->shortname); + if (sr_dev_info_get(dev, SR_DI_VDIVS, + (const void **)&rationals) != SR_OK) { + printf("\n"); + continue; + } + printf(" - supported volts/div:\n"); + for (i = 0; rationals[i].p && rationals[i].q; i++) + printf(" %s\n", sr_voltage_string( &rationals[i])); + + } else if (hwo->hwcap == SR_HWCAP_COUPLING) { + /* Supported coupling settings */ + printf(" %s", hwo->shortname); + if (sr_dev_info_get(dev, SR_DI_COUPLING, + (const void **)&stropts) != SR_OK) { + printf("\n"); + continue; + } + printf(" - supported coupling options:\n"); + for (i = 0; stropts[i]; i++) + printf(" %s\n", stropts[i]); + } else { + /* Everything else */ printf(" %s\n", hwo->shortname); } } @@ -341,14 +423,19 @@ static void show_pd_detail(void) static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) { static struct sr_output *o = NULL; - static int probelist[SR_MAX_NUM_PROBES + 1] = { 0 }; + static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 }; + static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES]; static uint64_t received_samples = 0; static int unitsize = 0; static int triggered = 0; static FILE *outfile = NULL; + static int num_analog_probes = 0; struct sr_probe *probe; - struct sr_datafeed_header *header; struct sr_datafeed_logic *logic; + struct sr_datafeed_meta_logic *meta_logic; + struct sr_datafeed_analog *analog; + struct sr_datafeed_meta_analog *meta_analog; + static int num_enabled_analog_probes = 0; int num_enabled_probes, sample_size, ret, i; uint64_t output_len, filter_out_len; uint8_t *output_buf, *filter_out; @@ -375,41 +462,8 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) exit(1); } } - - header = packet->payload; - num_enabled_probes = 0; - for (i = 0; i < header->num_logic_probes; i++) { - probe = g_slist_nth_data(dev->probes, i); - if (probe->enabled) - probelist[num_enabled_probes++] = probe->index; - } - /* How many bytes we need to store num_enabled_probes bits */ - unitsize = (num_enabled_probes + 7) / 8; - - outfile = stdout; - if (opt_output_file) { - if (default_output_format) { - /* output file is in session format, which means we'll - * dump everything in the datastore as it comes in, - * and save from there after the session. */ - outfile = NULL; - ret = sr_datastore_new(unitsize, &(dev->datastore)); - if (ret != SR_OK) { - g_critical("Failed to create datastore."); - exit(1); - } - } else { - /* saving to a file in whatever format was set - * with -O, so all we need is a filehandle */ - outfile = g_fopen(opt_output_file, "wb"); - } - } - if (opt_pds) { - if (srd_session_start(num_enabled_probes, unitsize, - header->samplerate) != SRD_OK) - sr_session_halt(); - } break; + case SR_DF_END: g_debug("cli: Received SR_DF_END"); if (!o) { @@ -418,7 +472,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) } if (o->format->event) { o->format->event(o, SR_DF_END, &output_buf, &output_len); - if (output_len) { + if (output_buf) { if (outfile) fwrite(output_buf, 1, output_len, outfile); g_free(output_buf); @@ -437,6 +491,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) g_free(o); o = NULL; break; + case SR_DF_TRIGGER: g_debug("cli: received SR_DF_TRIGGER"); if (o->format->event) @@ -444,67 +499,180 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet) &output_len); triggered = 1; break; + + case SR_DF_META_LOGIC: + g_message("cli: Received SR_DF_META_LOGIC"); + meta_logic = packet->payload; + num_enabled_probes = 0; + for (i = 0; i < meta_logic->num_probes; i++) { + probe = g_slist_nth_data(dev->probes, i); + if (probe->enabled) + logic_probelist[num_enabled_probes++] = probe->index; + } + /* How many bytes we need to store num_enabled_probes bits */ + unitsize = (num_enabled_probes + 7) / 8; + + outfile = stdout; + if (opt_output_file) { + if (default_output_format) { + /* output file is in session format, which means we'll + * dump everything in the datastore as it comes in, + * and save from there after the session. */ + outfile = NULL; + ret = sr_datastore_new(unitsize, &(dev->datastore)); + if (ret != SR_OK) { + printf("Failed to create datastore.\n"); + exit(1); + } + } else { + /* saving to a file in whatever format was set + * with --format, so all we need is a filehandle */ + outfile = g_fopen(opt_output_file, "wb"); + } + } + if (opt_pds) + srd_session_start(num_enabled_probes, unitsize, + meta_logic->samplerate); + break; + case SR_DF_LOGIC: logic = packet->payload; - sample_size = logic->unitsize; g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length); - break; - } + sample_size = logic->unitsize; + if (logic->length == 0) + break; - /* not supporting anything but SR_DF_LOGIC for now */ + /* Don't store any samples until triggered. */ + if (opt_wait_trigger && !triggered) + break; - if (sample_size == -1 || logic->length == 0) - return; + if (limit_samples && received_samples >= limit_samples) + break; - /* Don't store any samples until triggered. */ - if (opt_wait_trigger && !triggered) - return; + ret = sr_filter_probes(sample_size, unitsize, logic_probelist, + logic->data, logic->length, + &filter_out, &filter_out_len); + if (ret != SR_OK) + break; - if (limit_samples && received_samples >= limit_samples) - return; + /* what comes out of the filter is guaranteed to be packed into the + * minimum size needed to support the number of samples at this sample + * size. however, the driver may have submitted too much -- cut off + * the buffer of the last packet according to the sample limit. + */ + if (limit_samples && (received_samples + logic->length / sample_size > + limit_samples * sample_size)) + filter_out_len = limit_samples * sample_size - received_samples; - /* TODO: filters only support SR_DF_LOGIC */ - ret = sr_filter_probes(sample_size, unitsize, probelist, - logic->data, logic->length, - &filter_out, &filter_out_len); - if (ret != SR_OK) - return; + if (dev->datastore) + sr_datastore_put(dev->datastore, filter_out, + filter_out_len, sample_size, logic_probelist); - /* what comes out of the filter is guaranteed to be packed into the - * minimum size needed to support the number of samples at this sample - * size. however, the driver may have submitted too much -- cut off - * the buffer of the last packet according to the sample limit. - */ - if (limit_samples && (received_samples + logic->length / sample_size > - limit_samples * sample_size)) - filter_out_len = limit_samples * sample_size - received_samples; + if (opt_output_file && default_output_format) + /* saving to a session file, don't need to do anything else + * to this data for now. */ + goto cleanup; + + if (opt_pds) { + if (srd_session_send(received_samples, (uint8_t*)filter_out, + filter_out_len) != SRD_OK) + sr_session_halt(); + } else { + output_len = 0; + if (o->format->data && packet->type == o->format->df_type) + o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len); + if (output_buf) { + fwrite(output_buf, 1, output_len, outfile); + g_free(output_buf); + } + } - if (dev->datastore) - sr_datastore_put(dev->datastore, filter_out, - filter_out_len, sample_size, probelist); + cleanup: + g_free(filter_out); + received_samples += logic->length / sample_size; + break; - if (opt_output_file && default_output_format) - /* saving to a session file, don't need to do anything else - * to this data for now. */ - goto cleanup; + case SR_DF_META_ANALOG: + g_message("cli: Received SR_DF_META_ANALOG"); + meta_analog = packet->payload; + num_analog_probes = meta_analog->num_probes; + num_enabled_analog_probes = 0; + for (i = 0; i < num_analog_probes; i++) { + probe = g_slist_nth_data(dev->probes, i); + if (probe->enabled) + analog_probelist[num_enabled_analog_probes++] = probe; + } - if (opt_pds) { - if (srd_session_send(received_samples, (uint8_t*)filter_out, - filter_out_len) != SRD_OK) - sr_session_halt(); - } else { - output_len = 0; - if (o->format->data && packet->type == o->format->df_type) - o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len); - if (output_len) { - fwrite(output_buf, 1, output_len, outfile); - g_free(output_buf); + outfile = stdout; + if (opt_output_file) { + if (default_output_format) { + /* output file is in session format, which means we'll + * dump everything in the datastore as it comes in, + * and save from there after the session. */ + outfile = NULL; + ret = sr_datastore_new(unitsize, &(dev->datastore)); + if (ret != SR_OK) { + printf("Failed to create datastore.\n"); + exit(1); + } + } else { + /* saving to a file in whatever format was set + * with --format, so all we need is a filehandle */ + outfile = g_fopen(opt_output_file, "wb"); + } } + break; + + case SR_DF_ANALOG: + analog = packet->payload; + g_message("cli: received SR_DF_ANALOG, %d samples", analog->num_samples); + if (analog->num_samples == 0) + break; + + if (limit_samples && received_samples >= limit_samples) + break; + + if (o->format->data && packet->type == o->format->df_type) { + o->format->data(o, (const uint8_t *)analog->data, + analog->num_samples * sizeof(float), + &output_buf, &output_len); + if (output_buf) { + fwrite(output_buf, 1, output_len, outfile); + g_free(output_buf); + } + } + + received_samples += analog->num_samples; + break; + + case SR_DF_FRAME_BEGIN: + g_debug("cli: received SR_DF_FRAME_BEGIN"); + if (o->format->event) { + o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf, + &output_len); + if (output_buf) { + fwrite(output_buf, 1, output_len, outfile); + g_free(output_buf); + } + } + break; + + case SR_DF_FRAME_END: + g_debug("cli: received SR_DF_FRAME_END"); + if (o->format->event) { + o->format->event(o, SR_DF_FRAME_END, &output_buf, + &output_len); + if (output_buf) { + fwrite(output_buf, 1, output_len, outfile); + g_free(output_buf); + } + } + break; + + default: + g_message("received unknown packet type %d", packet->type); } -cleanup: - g_free(filter_out); - received_samples += logic->length / sample_size; } /* Register the given PDs for this session. @@ -581,7 +749,7 @@ int setup_pd_stack(void) { struct srd_decoder_inst *di_from, *di_to; int ret, i; - char **pds; + char **pds, **ids; /* Set up the protocol decoder stack. */ pds = g_strsplit(opt_pds, ",", 0); @@ -597,17 +765,26 @@ int setup_pd_stack(void) } } - if (!(di_from = srd_inst_find_by_id(pds[0]))) { + /* First PD goes at the bottom of the stack. */ + ids = g_strsplit(pds[0], ":", 0); + if (!(di_from = srd_inst_find_by_id(ids[0]))) { + g_strfreev(ids); g_critical("Cannot stack protocol decoder '%s': " "instance not found.", pds[0]); return 1; } + g_strfreev(ids); + + /* Every subsequent PD goes on top. */ for (i = 1; pds[i]; i++) { - if (!(di_to = srd_inst_find_by_id(pds[i]))) { + ids = g_strsplit(pds[i], ":", 0); + if (!(di_to = srd_inst_find_by_id(ids[0]))) { + g_strfreev(ids); g_critical("Cannot stack protocol decoder '%s': " "instance not found.", pds[i]); return 1; } + g_strfreev(ids); if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK) return 1; @@ -687,6 +864,7 @@ int setup_output_format(void) */ default_output_format = TRUE; } + fmtargs = parse_generic_arg(opt_output_format); fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key"); if (!fmtspec) { @@ -927,9 +1105,11 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args) GHashTableIter iter; gpointer key, value; int ret, i; + float tmp_float; uint64_t tmp_u64; - gboolean found; + struct sr_rational tmp_rat; gboolean tmp_bool; + gboolean found; g_hash_table_iter_init(&iter, args); while (g_hash_table_iter_next(&iter, &key, &value)) { @@ -964,6 +1144,23 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args) sr_hwcap_options[i].hwcap, GINT_TO_POINTER(tmp_bool)); break; + case SR_T_FLOAT: + tmp_float = strtof(value, NULL); + ret = dev->driver->dev_config_set(dev->driver_index, + sr_hwcap_options[i].hwcap, &tmp_float); + break; + case SR_T_RATIONAL_PERIOD: + if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK) + break; + ret = dev->driver->dev_config_set(dev->driver_index, + sr_hwcap_options[i].hwcap, &tmp_rat); + break; + case SR_T_RATIONAL_VOLT: + if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK) + break; + ret = dev->driver->dev_config_set(dev->driver_index, + sr_hwcap_options[i].hwcap, &tmp_rat); + break; default: ret = SR_ERR; } @@ -1115,6 +1312,16 @@ static void run_session(void) } } + if (opt_frames) { + if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK) + || (dev->driver->dev_config_set(dev->driver_index, + SR_HWCAP_LIMIT_FRAMES, &limit_frames) != SR_OK)) { + printf("Failed to configure frame limit.\n"); + sr_session_destroy(); + return; + } + } + if (dev->driver->dev_config_set(dev->driver_index, SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) { g_critical("Failed to configure probes."); @@ -1211,7 +1418,7 @@ int main(int argc, char **argv) show_dev_list(); else if (opt_input_file) load_input_file(); - else if (opt_samples || opt_time || opt_continuous) + else if (opt_samples || opt_time || opt_frames || opt_continuous) run_session(); else if (opt_dev) show_dev_detail();