#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "sigrok.h"
+#include <sigrok.h>
#define DEFAULT_BPL_BIN 64
#define DEFAULT_BPL_HEX 256
struct context {
- int num_enabled_probes;
+ unsigned int num_enabled_probes;
int samples_per_line;
- int unitsize;
+ unsigned int unitsize;
int line_offset;
int linebuf_len;
char *probelist[65];
};
-static void flush_linebufs(struct context *ctx, GSList *probes, char *outbuf)
+static void flush_linebufs(struct context *ctx, char *outbuf)
{
static int max_probename_len = 0;
int len, i;
}
-static void init(struct output *o, int default_spl)
+static int init(struct output *o, int default_spl)
{
struct context *ctx;
struct probe *probe;
GSList *l;
uint64_t samplerate;
int num_probes;
+ char *samplerate_s;
ctx = malloc(sizeof(struct context));
o->internal = ctx;
ctx->header = malloc(512);
num_probes = g_slist_length(o->device->probes);
- samplerate = *((uint64_t *) o->device->plugin->get_device_info(o->device->plugin_index, DI_CUR_SAMPLE_RATE));
+ samplerate = *((uint64_t *) o->device->plugin->get_device_info(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 >= GHZ(1))
- snprintf(ctx->header + strlen(ctx->header), 512, "%"PRIu64" GHz", samplerate / 1000000000);
- else if(samplerate >= MHZ(1))
- snprintf(ctx->header + strlen(ctx->header), 512, "%"PRIu64" MHz", samplerate / 1000000);
- else if(samplerate >= KHZ(1))
- snprintf(ctx->header + strlen(ctx->header), 512, "%"PRIu64" KHz", samplerate / 1000);
- else
- snprintf(ctx->header + strlen(ctx->header), 512, "%"PRIu64" Hz", samplerate);
- snprintf(ctx->header + strlen(ctx->header), 512, "\n");
+
+ if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL)
+ return -1; // FIXME
+ snprintf(ctx->header + strlen(ctx->header), 512, "%s\n", samplerate_s);
+ free(samplerate_s);
ctx->linebuf_len = ctx->samples_per_line * 2;
ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len);
ctx->linevalues = calloc(1, num_probes);
+ return 0;
}
case DF_END:
outsize = ctx->num_enabled_probes * (ctx->samples_per_line + 20) + 512;
outbuf = calloc(1, outsize);
- flush_linebufs(ctx, o->device->probes, outbuf);
+ flush_linebufs(ctx, outbuf);
*data_out = outbuf;
*length_out = strlen(outbuf);
free(o->internal);
}
-static void init_binary(struct output *o)
+static int init_binary(struct output *o)
{
- init(o, DEFAULT_BPL_BIN);
+ return init(o, DEFAULT_BPL_BIN);
}
static int data_binary(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
{
struct context *ctx;
- int outsize, offset, p;
+ unsigned int outsize, offset, p;
uint64_t sample;
char *outbuf;
ctx = o->internal;
- outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * 3 + 512;
+ outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * ctx->samples_per_line + 512;
outbuf = calloc(1, outsize+1);
if(ctx->header) {
/* the header is still in here, we must be on the first data packet */
else
outbuf[0] = 0;
- if(length_in > ctx->unitsize) {
+ if(length_in >= ctx->unitsize) {
for(offset = 0; offset <= length_in - ctx->unitsize; offset += ctx->unitsize) {
memcpy(&sample, data_in + offset, ctx->unitsize);
for(p = 0; p < ctx->num_enabled_probes; p++) {
/* end of line */
if(ctx->spl_cnt >= ctx->samples_per_line) {
- flush_linebufs(ctx, o->device->probes, outbuf);
+ flush_linebufs(ctx, outbuf);
ctx->line_offset = ctx->spl_cnt = 0;
}
}
}
-static void init_hex(struct output *o)
+static int init_hex(struct output *o)
{
- init(o, DEFAULT_BPL_BIN);
+ return init(o, DEFAULT_BPL_BIN);
}
static int data_hex(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
{
struct context *ctx;
- int outsize, offset, p;
+ unsigned int outsize, offset, p;
uint64_t sample;
char *outbuf;
ctx = o->internal;
- outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * 3 + 512;
+ outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * ctx->samples_per_line + 512;
outbuf = calloc(1, outsize+1);
if(ctx->header) {
/* the header is still in here, we must be on the first data packet */
/* end of line */
if(ctx->spl_cnt >= ctx->samples_per_line) {
- flush_linebufs(ctx, o->device->probes, outbuf);
+ flush_linebufs(ctx, outbuf);
ctx->line_offset = ctx->spl_cnt = 0;
}
}
struct output_format output_text_binary = {
- "bin",
- "Text (binary)",
+ "bits",
+ "Text (bits)",
init_binary,
data_binary,
event