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

implement version 1.3 of the OLS output format, now streaming

This commit is contained in:
Bert Vermeulen 2011-02-12 06:18:16 +01:00
parent 4bfbf9fce7
commit 305bde4d42
1 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
output/output_ols.c
View File

@ -20,8 +20,9 @@
*/ */
/* /*
* Output format for the OpenBench Logic Sniffer "Alternative" Java client. * This implements version 1.3 of the output format for the OpenBench Logic
* Details: https://github.com/jawi/ols/wiki/OLS-data-file-format * Sniffer "Alternative" Java client. Details:
* https://github.com/jawi/ols/wiki/OLS-data-file-format
*/ */
#include <stdlib.h> #include <stdlib.h>
@ -32,58 +33,24 @@
struct context { struct context {
GString *header; GString *header;
GString *body;
uint64_t num_samples; uint64_t num_samples;
gboolean got_trigger;
uint64_t trigger_pos;
unsigned int unitsize; unsigned int unitsize;
}; };
static void make_header(struct sr_output *o)
{
struct context *ctx;
uint64_t samplerate;
int i;
ctx = o->internal;
if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE))
samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
else
samplerate = 0;
g_string_append_printf(ctx->header, ";Size: %"PRIu64"\n", ctx->num_samples);
g_string_append_printf(ctx->header, ";Rate: %"PRIu64"\n", samplerate);
g_string_append_printf(ctx->header, ";Channels: %d\n", ctx->unitsize*8);
g_string_append_printf(ctx->header, ";EnabledChannels: -1\n");
if (ctx->got_trigger)
g_string_append_printf(ctx->header, ";TriggerPosition: %"PRIu64"\n", ctx->trigger_pos);
g_string_append_printf(ctx->header, ";Compressed: true\n");
g_string_append_printf(ctx->header, ";AbsoluteLength: %"PRIu64"\n", ctx->num_samples);
g_string_append_printf(ctx->header, ";CursorEnabled: false\n");
for (i = 0; i < 10; i++)
g_string_append_printf(ctx->header, ";Cursor%d: 0\n", i);
}
static int init(struct sr_output *o) static int init(struct sr_output *o)
{ {
struct context *ctx; struct context *ctx;
struct sr_probe *probe; struct sr_probe *probe;
GSList *l; GSList *l;
int num_enabled_probes; uint64_t samplerate;
int num_enabled_probes, i;
if (!(ctx = g_malloc(sizeof(struct context)))) if (!(ctx = g_malloc(sizeof(struct context))))
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
o->internal = ctx; o->internal = ctx;
ctx->header = g_string_sized_new(512);
ctx->body = g_string_sized_new(512);
ctx->num_samples = 0; ctx->num_samples = 0;
ctx->got_trigger = FALSE;
ctx->trigger_pos = 0;
num_enabled_probes = 0; num_enabled_probes = 0;
for (l = o->device->probes; l; l = l->next) { for (l = o->device->probes; l; l = l->next) {
probe = l->data; probe = l->data;
@ -92,6 +59,21 @@ static int init(struct sr_output *o)
} }
ctx->unitsize = (num_enabled_probes + 7) / 8; ctx->unitsize = (num_enabled_probes + 7) / 8;
if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE))
samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
else
samplerate = 0;
ctx->header = g_string_sized_new(512);
g_string_append_printf(ctx->header, ";Rate: %"PRIu64"\n", samplerate);
g_string_append_printf(ctx->header, ";Channels: %d\n", num_enabled_probes);
g_string_append_printf(ctx->header, ";EnabledChannels: -1\n");
g_string_append_printf(ctx->header, ";Compressed: true\n");
g_string_append_printf(ctx->header, ";CursorEnabled: false\n");
for (i = 0; i < 10; i++)
g_string_append_printf(ctx->header, ";Cursor%d: 0\n", i);
return SR_OK; return SR_OK;
} }
@ -101,47 +83,45 @@ static int event(struct sr_output *o, int event_type, char **data_out,
struct context *ctx; struct context *ctx;
ctx = o->internal; ctx = o->internal;
*data_out = NULL;
*length_out = 0;
switch (event_type) { if (ctx && event_type == SR_DF_END) {
case SR_DF_TRIGGER: if (ctx->header)
ctx->got_trigger = TRUE;
ctx->trigger_pos = ctx->num_samples;
break;
case SR_DF_END:
make_header(o);
*length_out = ctx->header->len + ctx->body->len;
*data_out = g_malloc(*length_out);
memcpy(*data_out, ctx->header->str, ctx->header->len);
memcpy(*data_out + ctx->header->len, ctx->body->str, ctx->body->len);
g_string_free(ctx->header, TRUE); g_string_free(ctx->header, TRUE);
g_string_free(ctx->body, TRUE);
free(o->internal); free(o->internal);
o->internal = NULL; o->internal = NULL;
break;
} }
*data_out = NULL;
*length_out = 0;
return SR_OK; return SR_OK;
} }
static int data(struct sr_output *o, char *data_in, uint64_t length_in, static int data(struct sr_output *o, char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out) char **data_out, uint64_t *length_out)
{ {
GString *out;
struct context *ctx; struct context *ctx;
uint64_t sample; uint64_t sample;
unsigned int i; unsigned int i;
ctx = o->internal; ctx = o->internal;
if (ctx->header) {
/* first data packet */
out = ctx->header;
ctx->header = NULL;
} else
out = g_string_sized_new(512);
for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) { for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
sample = 0; sample = 0;
memcpy(&sample, data_in + i, ctx->unitsize); memcpy(&sample, data_in + i, ctx->unitsize);
g_string_append_printf(ctx->body, "%08x@%"PRIu64"\n", g_string_append_printf(out, "%08x@%"PRIu64"\n",
(uint32_t) sample, ctx->num_samples++); (uint32_t) sample, ctx->num_samples++);
} }
*data_out = out->str;
*data_out = NULL; *length_out = out->len;
*length_out = 0; g_string_free(out, FALSE);
return SR_OK; return SR_OK;
} }