uint8_t *linevalues;
char *header;
int mark_trigger;
-// struct analog_sample *prevsample;
+// struct sr_analog_sample *prevsample;
enum outputmode mode;
};
memset(ctx->linebuf, 0, i * ctx->linebuf_len);
}
-static int init(struct output *o, int default_spl, enum outputmode mode)
+static int init(struct sr_output *o, int default_spl, enum outputmode mode)
{
struct context *ctx;
- struct probe *probe;
+ struct sr_probe *probe;
GSList *l;
uint64_t samplerate;
int num_probes;
}
ctx->probelist[ctx->num_enabled_probes] = 0;
- ctx->unitsize = sizeof(struct analog_sample) +
- (ctx->num_enabled_probes * sizeof(struct analog_probe));
+ ctx->unitsize = sizeof(struct sr_analog_sample) +
+ (ctx->num_enabled_probes * sizeof(struct sr_analog_probe));
ctx->line_offset = 0;
ctx->spl_cnt = 0;
ctx->mark_trigger = -1;
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->device->probes);
- if (o->device->plugin) {
+ 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, DI_CUR_SAMPLERATE));
- if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
+ o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+ if (!(samplerate_s = sr_samplerate_string(samplerate))) {
free(ctx->header);
free(ctx);
return SR_ERR;
return SR_OK;
}
-static int event(struct output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, char **data_out,
uint64_t *length_out)
{
struct context *ctx;
ctx = o->internal;
switch (event_type) {
- case DF_TRIGGER:
+ case SR_DF_TRIGGER:
ctx->mark_trigger = ctx->spl_cnt;
*data_out = NULL;
*length_out = 0;
break;
- case DF_END:
+ case SR_DF_END:
outsize = ctx->num_enabled_probes
* (ctx->samples_per_line + 20) + 512;
if (!(outbuf = calloc(1, outsize)))
return SR_OK;
}
-static int init_bits(struct output *o)
+static int init_bits(struct sr_output *o)
{
return init(o, DEFAULT_BPL_BITS, MODE_BITS);
}
-static int data_bits(struct output *o, char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out)
+static int data_bits(struct sr_output *o, const char *data_in,
+ uint64_t length_in, char **data_out, uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
int max_linelen;
- struct analog_sample *sample;
+ struct sr_analog_sample *sample;
char *outbuf, c;
ctx = o->internal;
- max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+ max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+ ctx->samples_per_line / 8;
/*
* Calculate space needed for probes. Set aside 512 bytes for
if (length_in >= ctx->unitsize) {
for (offset = 0; offset <= length_in - ctx->unitsize;
offset += ctx->unitsize) {
- sample = (struct analog_sample *) (data_in + offset);
+ sample = (struct sr_analog_sample *) (data_in + offset);
for (p = 0; p < ctx->num_enabled_probes; p++) {
int val = sample->probes[p].val;
int res = sample->probes[p].res;
return SR_OK;
}
#if 0
-static int init_hex(struct output *o)
+static int init_hex(struct sr_output *o)
{
return init(o, DEFAULT_BPL_HEX, MODE_HEX);
}
-static int data_hex(struct output *o, char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out)
+static int data_hex(struct sr_output *o, const char *data_in,
+ uint64_t length_in, char **data_out, uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
char *outbuf;
ctx = o->internal;
- max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+ max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+ ctx->samples_per_line / 2;
outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
/ ctx->samples_per_line * max_linelen + 512;
return SR_OK;
}
-static int init_ascii(struct output *o)
+static int init_ascii(struct sr_output *o)
{
return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
}
-static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out)
+static int data_ascii(struct sr_output *o, const char *data_in,
+ uint64_t length_in, char **data_out, uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
char *outbuf;
ctx = o->internal;
- max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+ max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+ ctx->samples_per_line / 8;
/*
* Calculate space needed for probes. Set aside 512 bytes for
}
#endif
-struct output_format output_analog_bits = {
+struct sr_output_format output_analog_bits = {
"analog_bits",
"Bits (takes argument, default 64)",
- DF_ANALOG,
+ SR_DF_ANALOG,
init_bits,
data_bits,
event,
};
#if 0
-struct output_format output_analog_hex = {
+struct sr_output_format output_analog_hex = {
"analog_hex",
"Hexadecimal (takes argument, default 192)",
- DF_ANALOG,
+ SR_DF_ANALOG,
init_hex,
data_hex,
event,
};
-struct output_format output_analog_ascii = {
+struct sr_output_format output_analog_ascii = {
"analog_ascii",
"ASCII (takes argument, default 74)",
- DF_ANALOG,
+ SR_DF_ANALOG,
init_ascii,
data_ascii,
event,