g_free(name);
g_free(contents);
- return status;
+ return status ? SR_OK : SR_ERR;
}
/* Send N samples of the given value. */
char name[16];
struct context *inc;
- inc = g_malloc0(sizeof(struct context));
-
num_channels = g_variant_get_int32(g_hash_table_lookup(options, "numchannels"));
if (num_channels < 1) {
sr_err("Invalid value for numchannels: must be at least 1.");
sr_err("No more than 64 channels supported.");
return SR_ERR_ARG;
}
+ inc = in->priv = g_malloc0(sizeof(struct context));
inc->maxchannels = num_channels;
inc->downsample = g_variant_get_int32(g_hash_table_lookup(options, "downsample"));
inc->skip = g_variant_get_int32(g_hash_table_lookup(options, "skip"));
inc->skip /= inc->downsample;
- /* Create a virtual device. */
- in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
+ in->sdi = sr_dev_inst_new();
in->priv = inc;
for (i = 0; i < num_channels; i++) {
return FALSE;
}
-static int receive(const struct sr_input *in, GString *buf)
+static int process_buffer(struct sr_input *in)
{
struct sr_datafeed_packet packet;
struct sr_datafeed_meta meta;
uint64_t samplerate;
char *p;
- g_string_append_len(in->buf, buf->str, buf->len);
-
inc = in->priv;
- if (!inc->got_header) {
- if (!have_header(in->buf))
- return SR_OK;
- if (!parse_header(in, in->buf) != SR_OK)
- /* There was a header in there, but it was malformed. */
- return SR_ERR;
-
+ if (!inc->started) {
std_session_send_df_header(in->sdi, LOG_PREFIX);
- inc->started = TRUE;
packet.type = SR_DF_META;
packet.payload = &meta;
meta.config = g_slist_append(NULL, src);
sr_session_send(in->sdi, &packet);
sr_config_free(src);
+
+ inc->started = TRUE;
}
while ((p = g_strrstr_len(in->buf->str, in->buf->len, "\n"))) {
return SR_OK;
}
-static int cleanup(struct sr_input *in)
+static int receive(struct sr_input *in, GString *buf)
+{
+ struct context *inc;
+ int ret;
+
+ g_string_append_len(in->buf, buf->str, buf->len);
+
+ inc = in->priv;
+ if (!inc->got_header) {
+ if (!have_header(in->buf))
+ return SR_OK;
+ if (!parse_header(in, in->buf) != SR_OK)
+ /* There was a header in there, but it was malformed. */
+ return SR_ERR;
+
+ in->sdi_ready = TRUE;
+ /* sdi is ready, notify frontend. */
+ return SR_OK;
+ }
+
+ ret = process_buffer(in);
+
+ return ret;
+}
+
+static int end(struct sr_input *in)
{
struct sr_datafeed_packet packet;
struct context *inc;
+ int ret;
+
+ if (in->sdi_ready)
+ ret = process_buffer(in);
+ else
+ ret = SR_OK;
inc = in->priv;
if (inc->started) {
- /* End of stream. */
packet.type = SR_DF_END;
sr_session_send(in->sdi, &packet);
}
- g_slist_free_full(inc->channels, free_channel);
- g_free(inc);
- in->priv = NULL;
+ return ret;
+}
- return SR_OK;
+static void cleanup(struct sr_input *in)
+{
+ struct context *inc;
+
+ inc = in->priv;
+ g_slist_free_full(inc->channels, free_channel);
}
static struct sr_option options[] = {
- { "numchannels", "Max channels", "Maximum number of channels", NULL, NULL },
+ { "numchannels", "Number of channels", "Number of channels", NULL, NULL },
{ "skip", "Skip", "Skip until timestamp", NULL, NULL },
{ "downsample", "Downsample", "Divide samplerate by factor", NULL, NULL },
{ "compress", "Compress", "Compress idle periods longer than this value", NULL, NULL },
- { 0 }
+ ALL_ZERO
};
static struct sr_option *get_options(void)
.format_match = format_match,
.init = init,
.receive = receive,
+ .end = end,
.cleanup = cleanup,
};