#include "config.h"
struct context {
- int num_enabled_probes;
- int unitsize;
+ unsigned int num_enabled_probes;
+ unsigned int unitsize;
char *probelist[65];
char *header;
};
const char *gnuplot_header = "\
# Sample data in space-separated columns format usable by gnuplot\n\
#\n\
-# Generated by: %s on %s\n\
-# Comment: Acquisition with %d/%d probes at %s\n\
+# Generated by: %s on %s%s\
# Timescale: %d %s\n\
# Column assignment:\n%s\n";
+const char *gnuplot_header_comment = "\
+# Comment: Acquisition with %d/%d probes at %s\n";
+
static int init(struct output *o)
{
/* Maximum header length */
struct probe *probe;
GSList *l;
uint64_t samplerate;
- int i, b, num_probes;
+ unsigned int i;
+ int b, num_probes;
char *c, *samplerate_s;
- char wbuf[1000];
+ char wbuf[1000], comment[128];
+ time_t t;
- ctx = malloc(sizeof(struct context));
- if (ctx == NULL)
+ if (!(ctx = calloc(1, sizeof(struct context))))
return SIGROK_ERR_MALLOC;
+
o->internal = ctx;
ctx->num_enabled_probes = 0;
for (l = o->device->probes; l; l = l->next) {
/* TODO: Allow for configuration via o->param. */
- ctx->header = calloc(1, MAX_HEADER_LEN + 1);
- if (ctx->header == NULL)
+ if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
+ free(ctx);
return SIGROK_ERR_MALLOC;
+ }
+
num_probes = g_slist_length(o->device->probes);
/* TODO: Handle num_probes == 0, too many probes, etc. */
- samplerate = *((uint64_t *) o->device->plugin->get_device_info(
- o->device->plugin_index, DI_CUR_SAMPLERATE));
-
- if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL)
- return -1; // FIXME
+
+ comment[0] = '\0';
+ if (o->device->plugin) {
+ samplerate = *((uint64_t *) o->device->plugin->get_device_info(
+ o->device->plugin_index, DI_CUR_SAMPLERATE));
+ if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
+ free(ctx->header);
+ free(ctx);
+ return SIGROK_ERR;
+ }
+ snprintf(comment, 127, gnuplot_header_comment,
+ ctx->num_enabled_probes, num_probes, samplerate_s);
+ free(samplerate_s);
+ }
/* Columns / channels */
wbuf[0] = '\0';
/* TODO: date: File or signals? Make y/n configurable. */
/* TODO: Timescale */
+ t = time(NULL);
b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
- PACKAGE_STRING, "TODO", ctx->num_enabled_probes,
- num_probes, samplerate_s, 1, "ns", (char *)&wbuf);
-
- free(samplerate_s);
+ PACKAGE_STRING, ctime(&t), comment, 1, "ns",
+ (char *)&wbuf);
/* TODO: Handle snprintf errors. */
int outlen = 1; /* FIXME */
ctx = o->internal;
- switch(event_type) {
+ switch (event_type) {
case DF_TRIGGER:
+ /* TODO */
break;
case DF_END:
- outbuf = calloc(1, 1); // FIXME
+ outbuf = calloc(1, 1); /* FIXME */
if (outbuf == NULL)
return SIGROK_ERR_MALLOC;
*data_out = outbuf;
char **data_out, uint64_t *length_out)
{
struct context *ctx;
- int offset, outsize, p, curbit;
+ unsigned int i, outsize, p, curbit;
uint64_t sample, count = 0;
char *outbuf, *c;
ctx = o->internal;
- outsize = strlen(ctx->header);
- outbuf = calloc(1, outsize + 1 + 10000); // FIXME: Use realloc().
- if (outbuf == NULL)
- return SIGROK_ERR_MALLOC;
+ outsize = 0;
+ if (ctx->header)
+ outsize = strlen(ctx->header);
+
+ /* FIXME: Use realloc(). */
+ if (!(outbuf = calloc(1, outsize + 1 + 10000)))
+ return SIGROK_ERR_MALLOC; /* TODO: free()? What to free? */
+
+ outbuf[0] = '\0';
if (ctx->header) {
/* The header is still here, this must be the first packet. */
strncpy(outbuf, ctx->header, outsize);
free(ctx->header);
ctx->header = NULL;
- } else {
- outbuf[0] = 0;
}
/* TODO: Are disabled probes handled correctly? */
- for (offset = 0; offset <= length_in - ctx->unitsize;
- offset += ctx->unitsize) {
- memcpy(&sample, data_in + offset, ctx->unitsize);
+ for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
+ memcpy(&sample, data_in + i, ctx->unitsize);
/* The first column is a counter (needed for gnuplot). */
c = outbuf + strlen(outbuf);
- sprintf(c, "%"PRIu64"\t\t", count++);
+ sprintf(c, "%" PRIu64 "\t\t", count++);
/* The next columns are the values of all channels. */
for (p = 0; p < ctx->num_enabled_probes; p++) {