BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output_text: always print sigrok version

This commit is contained in:
Bert Vermeulen 2010-05-05 22:06:38 -07:00
parent c9c1c6458c
commit d2b36a10d7
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
output/output_text.c
View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include <sigrok.h> #include <sigrok.h>
#include "config.h"
#define DEFAULT_BPL_BITS 64 #define DEFAULT_BPL_BITS 64
#define DEFAULT_BPL_HEX 256 #define DEFAULT_BPL_HEX 256
@ -100,24 +101,18 @@ static int init(struct output *o, int default_spl)
else else
ctx->samples_per_line = default_spl; ctx->samples_per_line = default_spl;
ctx->header = malloc(512);
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
if (o->device->plugin) { if (o->device->plugin) {
ctx->header = malloc(512);
num_probes = g_slist_length(o->device->probes); num_probes = g_slist_length(o->device->probes);
samplerate = *((uint64_t *) o->device->plugin->get_device_info( samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, DI_CUR_SAMPLERATE)); o->device->plugin_index, DI_CUR_SAMPLERATE));
snprintf(ctx->header, 512, "Acquisition with %d/%d probes at ",
ctx->num_enabled_probes, num_probes);
if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL) if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL)
return -1; /* FIXME */ return SIGROK_ERR;
snprintf(ctx->header + strlen(ctx->header), 512, "%s\n", samplerate_s); snprintf(ctx->header + strlen(ctx->header), 511 - strlen(ctx->header),
"Acquisition with %d/%d probes at %s\n", ctx->num_enabled_probes,
num_probes, samplerate_s);
free(samplerate_s); free(samplerate_s);
} else {
/*
* device has no plugin: this is just a dummy device, the data
* comes from a file.
*/
ctx->header = NULL;
} }
ctx->linebuf_len = ctx->samples_per_line * 2; ctx->linebuf_len = ctx->samples_per_line * 2;