X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=ab6217dfe77e6cb400a5819502c70de6e4d94b47;hb=91aea754aaed0f0f2a6fc4b2b875f0d0b7c01f8e;hp=3eda9bf99a95f62df5a966ff933e1861782dd020;hpb=d3c74a6fb05118e32ad421443251b7b3288918f9;p=libsigrok.git diff --git a/output/csv.c b/output/csv.c index 3eda9bf9..ab6217df 100644 --- a/output/csv.c +++ b/output/csv.c @@ -25,14 +25,7 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with subsystem-specific prefix string. */ -#define LOG_PREFIX "output/csv: " -#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) -#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) -#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) -#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) -#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) -#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) +#define LOG_PREFIX "output/csv" struct context { unsigned int num_enabled_probes; @@ -57,34 +50,29 @@ struct context { static int init(struct sr_output *o) { struct context *ctx; - struct sr_probe *probe; + struct sr_channel *probe; GSList *l; GVariant *gvar; int num_probes; time_t t; - if (!o) { - sr_err("%s: o was NULL", __func__); + if (!o) return SR_ERR_ARG; - } - if (!o->sdi) { - sr_err("%s: o->sdi was NULL", __func__); + if (!o->sdi) return SR_ERR_ARG; - } - - if (!(ctx = g_try_malloc0(sizeof(struct context)))) { - sr_err("%s: ctx malloc failed", __func__); - return SR_ERR_MALLOC; - } + ctx = g_try_malloc0(sizeof(struct context)); o->internal = ctx; /* Get the number of probes, and the unitsize. */ for (l = o->sdi->probes; l; l = l->next) { probe = l->data; - if (probe->enabled) - ctx->num_enabled_probes++; + if (probe->type != SR_PROBE_LOGIC) + continue; + if (!probe->enabled) + continue; + ctx->num_enabled_probes++; } ctx->unitsize = (ctx->num_enabled_probes + 7) / 8; @@ -110,107 +98,92 @@ static int init(struct sr_output *o) ctx->samplerate); /* Columns / channels */ - g_string_append_printf(ctx->header, "; Channels (%d/%d): ", + g_string_append_printf(ctx->header, "; Channels (%d/%d):", ctx->num_enabled_probes, num_probes); for (l = o->sdi->probes; l; l = l->next) { probe = l->data; - if (probe->enabled) - g_string_append_printf(ctx->header, "%s, ", probe->name); + if (probe->type != SR_PROBE_LOGIC) + continue; + if (!probe->enabled) + continue; + g_string_append_printf(ctx->header, " %s,", probe->name); } + if (o->sdi->probes) + /* Drop last separator. */ + g_string_truncate(ctx->header, ctx->header->len - 1); g_string_append_printf(ctx->header, "\n"); return SR_OK; } -static int event(struct sr_output *o, int event_type, uint8_t **data_out, - uint64_t *length_out) +static int receive(struct sr_output *o, const struct sr_dev_inst *sdi, + const struct sr_datafeed_packet *packet, GString **out) { + const struct sr_datafeed_logic *logic; struct context *ctx; + uint64_t i, j; + gchar *p, c; - if (!o) { - sr_err("%s: o was NULL", __func__); - return SR_ERR_ARG; - } + (void)sdi; - if (!(ctx = o->internal)) { - sr_err("%s: o->internal was NULL", __func__); + *out = NULL; + if (!o || !o->sdi) return SR_ERR_ARG; - } - - if (!data_out) { - sr_err("%s: data_out was NULL", __func__); + if (!(ctx = o->internal)) return SR_ERR_ARG; - } - switch (event_type) { - case SR_DF_TRIGGER: - sr_dbg("%s: SR_DF_TRIGGER event", __func__); - /* TODO */ - *data_out = NULL; - *length_out = 0; + switch (packet->type) { + case SR_DF_LOGIC: + logic = packet->payload; + if (ctx->header) { + /* + * First data packet: prime the output with the + * previously prepared header. + */ + *out = ctx->header; + ctx->header = NULL; + } else { + *out = g_string_sized_new(512); + } + + for (i = 0; i <= logic->length - ctx->unitsize; i += ctx->unitsize) { + for (j = 0; j < ctx->num_enabled_probes; j++) { + p = logic->data + i + j / 8; + c = *p & (1 << (j % 8)); + g_string_append_c(*out, c ? '1' : '0'); + g_string_append_c(*out, ctx->separator); + } + if (j) { + /* Drop last separator. */ + g_string_truncate(*out, (*out)->len - 1); + } + g_string_append_printf(*out, "\n"); + } break; case SR_DF_END: - sr_dbg("%s: SR_DF_END event", __func__); - /* TODO */ - *data_out = NULL; - *length_out = 0; g_free(o->internal); o->internal = NULL; break; - default: - sr_err("%s: unsupported event type: %d", __func__, event_type); - *data_out = NULL; - *length_out = 0; - break; } return SR_OK; } -static int data(struct sr_output *o, const uint8_t *data_in, - uint64_t length_in, uint8_t **data_out, uint64_t *length_out) +static int cleanup(struct sr_output *o) { struct context *ctx; - GString *outstr; - uint64_t sample, i, j; - if (!o) { - sr_err("%s: o was NULL", __func__); + if (!o || !o->sdi) return SR_ERR_ARG; - } - - if (!(ctx = o->internal)) { - sr_err("%s: o->internal was NULL", __func__); - return SR_ERR_ARG; - } - - if (!data_in) { - sr_err("%s: data_in was NULL", __func__); - return SR_ERR_ARG; - } - if (ctx->header) { - /* First data packet. */ - outstr = ctx->header; - ctx->header = NULL; - } else { - outstr = g_string_sized_new(512); - } - - for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) { - memcpy(&sample, data_in + i, ctx->unitsize); - for (j = 0; j < ctx->num_enabled_probes; j++) { - g_string_append_printf(outstr, "%d%c", - (int)((sample & (1 << j)) >> j), - ctx->separator); - } - g_string_append_printf(outstr, "\n"); + if (o->internal) { + ctx = o->internal; + if (ctx->header) + g_string_free(ctx->header, TRUE); + g_free(o->internal); + o->internal = NULL; } - *data_out = (uint8_t *)outstr->str; - *length_out = outstr->len; - g_string_free(outstr, FALSE); - return SR_OK; } @@ -219,6 +192,6 @@ SR_PRIV struct sr_output_format output_csv = { .description = "Comma-separated values (CSV)", .df_type = SR_DF_LOGIC, .init = init, - .data = data, - .event = event, + .receive = receive, + .cleanup = cleanup, };