uint8_t *linevalues;
char *header;
int mark_trigger;
-// struct analog_sample *prevsample;
+// struct sr_analog_sample *prevsample;
enum outputmode mode;
};
}
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 && device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
+ 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));
if (!(samplerate_s = sr_samplerate_string(samplerate))) {
return init(o, DEFAULT_BPL_BITS, MODE_BITS);
}
-static int data_bits(struct sr_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 init(o, DEFAULT_BPL_HEX, MODE_HEX);
}
-static int data_hex(struct sr_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 init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
}
-static int data_ascii(struct sr_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