unsigned int unitsize;
int line_offset;
int linebuf_len;
- char *probelist[65];
- char *linebuf;
+ char *probelist[SR_MAX_NUM_PROBES + 1];
+ uint8_t *linebuf;
int spl_cnt;
uint8_t *linevalues;
char *header;
enum outputmode mode;
};
-static void flush_linebufs(struct context *ctx, char *outbuf)
+static void flush_linebufs(struct context *ctx, uint8_t *outbuf)
{
static int max_probename_len = 0;
int len, i;
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->dev->probes);
- if (o->dev->plugin && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
- samplerate = *((uint64_t *) o->dev->plugin->dev_info_get(
- o->dev->plugin_index, SR_DI_CUR_SAMPLERATE));
+ if (o->dev->driver && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
+ samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
+ o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
if (!(samplerate_s = sr_samplerate_string(samplerate))) {
g_free(ctx->header);
g_free(ctx);
return SR_OK;
}
-static int event(struct sr_output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, uint8_t **data_out,
uint64_t *length_out)
{
struct context *ctx;
int outsize;
- char *outbuf;
+ uint8_t *outbuf;
ctx = o->internal;
switch (event_type) {
return init(o, DEFAULT_BPL_BITS, MODE_BITS);
}
-static int data_bits(struct sr_output *o, const char *data_in,
- uint64_t length_in, char **data_out, uint64_t *length_out)
+static int data_bits(struct sr_output *o, const uint8_t *data_in,
+ uint64_t length_in, uint8_t **data_out,
+ uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
int max_linelen;
struct sr_analog_sample *sample;
- char *outbuf, c;
+ uint8_t *outbuf, c;
ctx = o->internal;
max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
return init(o, DEFAULT_BPL_HEX, MODE_HEX);
}
-static int data_hex(struct sr_output *o, const char *data_in,
- uint64_t length_in, char **data_out, uint64_t *length_out)
+static int data_hex(struct sr_output *o, const uint8_t *data_in,
+ uint64_t length_in, uint8_t **data_out,
+ uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
int max_linelen;
uint64_t sample;
- char *outbuf;
+ uint8_t *outbuf;
ctx = o->internal;
max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
}
-static int data_ascii(struct sr_output *o, const char *data_in,
- uint64_t length_in, char **data_out, uint64_t *length_out)
+static int data_ascii(struct sr_output *o, const uint8_t *data_in,
+ uint64_t length_in, uint8_t **data_out,
+ uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
int max_linelen;
uint64_t sample;
- char *outbuf;
+ uint8_t *outbuf;
ctx = o->internal;
max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
SR_PRIV struct sr_output_format output_analog_bits = {
.id = "analog_bits",
- .description = "Bits (takes argument, default 64)",
+ .description = "Bits",
.df_type = SR_DF_ANALOG,
.init = init_bits,
.data = data_bits,
#if 0
struct sr_output_format output_analog_hex = {
.id = "analog_hex",
- .description = "Hexadecimal (takes argument, default 192)",
+ .description = "Hexadecimal",
.df_type = SR_DF_ANALOG,
.init = init_hex,
.data = data_hex,
struct sr_output_format output_analog_ascii = {
.id = "analog_ascii",
- .description = "ASCII (takes argument, default 74)",
+ .description = "ASCII",
.df_type = SR_DF_ANALOG,
.init = init_ascii,
.data = data_ascii,