- 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));
if (o->param && o->param[0]) {
ctx->samples_per_line = strtoul(o->param, NULL, 10);
if (ctx->samples_per_line < 1)
if (o->param && o->param[0]) {
ctx->samples_per_line = strtoul(o->param, NULL, 10);
if (ctx->samples_per_line < 1)
}
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->device->probes);
}
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->device->probes);
- 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))) {
}
snprintf(ctx->header + strlen(ctx->header),
511 - strlen(ctx->header),
}
snprintf(ctx->header + strlen(ctx->header),
511 - strlen(ctx->header),
-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,
outsize = ctx->num_enabled_probes
* (ctx->samples_per_line + 20) + 512;
if (!(outbuf = calloc(1, outsize)))
outsize = ctx->num_enabled_probes
* (ctx->samples_per_line + 20) + 512;
if (!(outbuf = calloc(1, outsize)))
flush_linebufs(ctx, outbuf);
*data_out = outbuf;
*length_out = strlen(outbuf);
flush_linebufs(ctx, outbuf);
*data_out = outbuf;
*length_out = strlen(outbuf);
-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)
* (ctx->num_enabled_probes * max_linelen);
if (!(outbuf = calloc(1, outsize + 1)))
* (ctx->num_enabled_probes * max_linelen);
if (!(outbuf = calloc(1, outsize + 1)))
if (length_in >= ctx->unitsize) {
for (offset = 0; offset <= length_in - ctx->unitsize;
offset += ctx->unitsize) {
if (length_in >= ctx->unitsize) {
for (offset = 0; offset <= length_in - ctx->unitsize;
offset += ctx->unitsize) {
for (p = 0; p < ctx->num_enabled_probes; p++) {
int val = sample->probes[p].val;
int res = sample->probes[p].res;
for (p = 0; p < ctx->num_enabled_probes; p++) {
int val = sample->probes[p].val;
int res = sample->probes[p].res;
-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)
+ ctx->samples_per_line / 2;
outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
/ ctx->samples_per_line * max_linelen + 512;
if (!(outbuf = calloc(1, outsize + 1)))
+ ctx->samples_per_line / 2;
outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
/ ctx->samples_per_line * max_linelen + 512;
if (!(outbuf = calloc(1, outsize + 1)))
-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)
* (ctx->num_enabled_probes * max_linelen);
if (!(outbuf = calloc(1, outsize + 1)))
* (ctx->num_enabled_probes * max_linelen);
if (!(outbuf = calloc(1, outsize + 1)))
-struct output_format output_analog_bits = {
- "analog_bits",
- "Bits (takes argument, default 64)",
- DF_ANALOG,
- init_bits,
- data_bits,
- event,
+struct sr_output_format output_analog_bits = {
+ .id = "analog_bits",
+ .description = "Bits (takes argument, default 64)",
+ .df_type = SR_DF_ANALOG,
+ .init = init_bits,
+ .data = data_bits,
+ .event = event,
-struct output_format output_analog_hex = {
- "analog_hex",
- "Hexadecimal (takes argument, default 192)",
- DF_ANALOG,
- init_hex,
- data_hex,
- event,
+struct sr_output_format output_analog_hex = {
+ .id = "analog_hex",
+ .description = "Hexadecimal (takes argument, default 192)",
+ .df_type = SR_DF_ANALOG,
+ .init = init_hex,
+ .data = data_hex,
+ .event = event,
-struct output_format output_analog_ascii = {
- "analog_ascii",
- "ASCII (takes argument, default 74)",
- DF_ANALOG,
- init_ascii,
- data_ascii,
- event,
+struct sr_output_format output_analog_ascii = {
+ .id = "analog_ascii",
+ .description = "ASCII (takes argument, default 74)",
+ .df_type = SR_DF_ANALOG,
+ .init = init_ascii,
+ .data = data_ascii,
+ .event = event,