X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=bb9305f6d521061dde7dac0966bab78735355e0c;hp=aeffeaa8d42f659aac62fde3d31d642e175cc138;hb=e54290bdb3429a30f06231976980652af3360b0c;hpb=11b62b6f90e9c65beb1b6880c7e254551e296ae2 diff --git a/sigrok-cli.c b/sigrok-cli.c index aeffeaa..bb9305f 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -36,6 +36,8 @@ #define DEFAULT_OUTPUT_FORMAT "bits:width=64" +static struct sr_context *sr_ctx = NULL; + static uint64_t limit_samples = 0; static uint64_t limit_frames = 0; static struct sr_output_format *output_format = NULL; @@ -162,7 +164,7 @@ static GSList *device_scan(void) return NULL; } g_free(drvname); - if (sr_driver_init(driver) != SR_OK) { + if (sr_driver_init(sr_ctx, driver) != SR_OK) { g_critical("Failed to initialize driver."); return NULL; } @@ -178,7 +180,7 @@ static GSList *device_scan(void) drivers = sr_driver_list(); for (i = 0; drivers[i]; i++) { driver = drivers[i]; - if (sr_driver_init(driver) != SR_OK) { + if (sr_driver_init(sr_ctx, driver) != SR_OK) { g_critical("Failed to initialize driver."); return NULL; } @@ -194,7 +196,7 @@ static GSList *device_scan(void) static void show_version(void) { - GSList *l; + const GSList *l; struct sr_dev_driver **drivers; struct sr_input_format **inputs; struct sr_output_format **outputs; @@ -256,16 +258,16 @@ static void print_dev_line(const struct sr_dev_inst *sdi) if (sdi->probes) { if (g_slist_length(sdi->probes) == 1) { probe = sdi->probes->data; - printf("with 1 probe: %s\n", probe->name); + printf("with 1 probe: %s", probe->name); } else { - printf("with %d probes:\n", g_slist_length(sdi->probes)); + printf("with %d probes:", g_slist_length(sdi->probes)); for (l = sdi->probes; l; l = l->next) { probe = l->data; - printf(" %s\n", probe->name); + printf(" %s", probe->name); } } - } else - printf("\n"); + } + printf("\n"); } static void show_dev_list(void) @@ -438,7 +440,7 @@ static void show_dev_detail(void) printf(" %s\n", stropts[i]); } else if (hwo->hwcap == SR_HWCAP_FILTER) { - /* Supported trigger sources */ + /* Supported filters */ printf(" %s", hwo->shortname); if (sr_info_get(sdi->driver, SR_DI_FILTERS, (const void **)&stropts, sdi) != SR_OK) { @@ -538,22 +540,18 @@ static void show_pd_detail(void) } static void datafeed_in(const struct sr_dev_inst *sdi, - struct sr_datafeed_packet *packet) + const struct sr_datafeed_packet *packet) { static struct sr_output *o = NULL; static int logic_probelist[SR_MAX_NUM_PROBES] = { -1 }; - 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_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; + const struct sr_datafeed_logic *logic; + const struct sr_datafeed_meta_logic *meta_logic; + const struct sr_datafeed_analog *analog; int num_enabled_probes, sample_size, ret, i; uint64_t output_len, filter_out_len; uint8_t *output_buf, *filter_out; @@ -717,14 +715,6 @@ static void datafeed_in(const struct sr_dev_inst *sdi, 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(sdi->probes, i); - if (probe->enabled) - analog_probelist[num_enabled_analog_probes++] = probe; - } outfile = stdout; if (opt_output_file) { @@ -821,7 +811,6 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) int ret; char **pdtokens, **pdtok, *pd_name; - /* Avoid compiler warnings. */ (void)dev; ret = 0; @@ -1062,31 +1051,23 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) static int select_probes(struct sr_dev_inst *sdi) { - char **probelist; - int max_probes, i; + struct sr_probe *probe; + GSList *selected_probes, *l; if (!opt_probes) return SR_OK; - /* - * This only works because a device by default initializes - * and enables all its probes. - */ - max_probes = g_slist_length(sdi->probes); - probelist = parse_probestring(max_probes, opt_probes); - if (!probelist) { + if (!(selected_probes = parse_probestring(sdi, opt_probes))) return SR_ERR; - } - for (i = 0; i < max_probes; i++) { - if (probelist[i]) { - sr_dev_probe_name_set(sdi, i, probelist[i]); - g_free(probelist[i]); - } else { - sr_dev_probe_enable(sdi, i, FALSE); - } + for (l = sdi->probes; l; l = l->next) { + probe = l->data; + if (g_slist_find(selected_probes, probe)) + probe->enabled = TRUE; + else + probe->enabled = FALSE; } - g_free(probelist); + g_slist_free(selected_probes); return SR_OK; } @@ -1295,8 +1276,6 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) g_critical("Failed to set device option '%s'.", (char *)key); return ret; } - else - break; } return SR_OK; @@ -1466,7 +1445,6 @@ static void run_session(void) static void logger(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer cb_data) { - /* Avoid compiler warnings. */ (void)log_domain; (void)cb_data; @@ -1483,6 +1461,7 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level, int main(int argc, char **argv) { + int ret = 1; GOptionContext *context; GError *error; @@ -1494,36 +1473,36 @@ int main(int argc, char **argv) if (!g_option_context_parse(context, &argc, &argv, &error)) { g_critical("%s", error->message); - return 1; + goto done; } /* Set the loglevel (amount of messages to output) for libsigrok. */ if (sr_log_loglevel_set(opt_loglevel) != SR_OK) - return 1; + goto done; /* Set the loglevel (amount of messages to output) for libsigrokdecode. */ if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) - return 1; + goto done; - if (sr_init() != SR_OK) - return 1; + if (sr_init(&sr_ctx) != SR_OK) + goto done; if (opt_pds) { if (srd_init(NULL) != SRD_OK) - return 1; + goto done; if (register_pds(NULL, opt_pds) != 0) - return 1; + goto done; if (srd_pd_output_callback_add(SRD_OUTPUT_ANN, show_pd_annotations, NULL) != SRD_OK) - return 1; + goto done; if (setup_pd_stack() != 0) - return 1; + goto done; if (setup_pd_annotations() != 0) - return 1; + goto done; } if (setup_output_format() != 0) - return 1; + goto done; if (opt_version) show_version(); @@ -1543,8 +1522,13 @@ int main(int argc, char **argv) if (opt_pds) srd_exit(); + ret = 0; + +done: + if (sr_ctx) + sr_exit(sr_ctx); + g_option_context_free(context); - sr_exit(); - return 0; + return ret; }