struct context {
int num_enabled_probes;
int unitsize;
- char *probelist[65];
+ char *probelist[SR_MAX_NUM_PROBES + 1];
int *prevbits;
GString *header;
uint64_t prevsample;
g_string_append_printf(ctx->header, "$version %s %s $end\n",
PACKAGE, PACKAGE_VERSION);
- if (o->dev->plugin && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
- ctx->samplerate = *((uint64_t *) o->dev->plugin->get_dev_info(
- o->dev->plugin_index, SR_DI_CUR_SAMPLERATE));
+ if (o->dev->driver && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
+ ctx->samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
+ o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
g_string_free(ctx->header, TRUE);
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;
- char *outbuf;
+ uint8_t *outbuf;
- ctx = o->internal;
switch (event_type) {
case SR_DF_END:
- outbuf = g_strdup("$dumpoff\n$end\n");
+ outbuf = (uint8_t *)g_strdup("$dumpoff\n$end\n");
*data_out = outbuf;
- *length_out = strlen(outbuf);
+ *length_out = strlen((const char *)outbuf);
g_free(o->internal);
o->internal = NULL;
break;
return SR_OK;
}
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out)
+static int data(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 i;
ctx->prevsample = sample;
}
- *data_out = out->str;
+ *data_out = (uint8_t *)out->str;
*length_out = out->len;
g_string_free(out, FALSE);