Bump copyright year

[libsigrok.git] / input / binary.c

diff --git a/input/binary.c b/input/binary.c
index 6e11cde0844eb5e0562657eafaf9f7511a0e921e..67d42f021c8626a332030b0e8b28b2be50744675 100644 (file)
--- a/input/binary.c
+++ b/input/binary.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ static int format_match(const char *filename)
        return TRUE;
 }
 
-static int init(struct sr_input *in)
+static int init(struct sr_input *in, const char *filename)
 {
        struct sr_probe *probe;
        int num_probes, i;
@@ -58,6 +58,8 @@ static int init(struct sr_input *in)
        char *param;
        struct context *ctx;
 
+       (void)filename;
+
        if (!(ctx = g_try_malloc0(sizeof(*ctx)))) {
                sr_err("Input format context malloc failed.");
                return SR_ERR_MALLOC;
@@ -98,10 +100,10 @@ static int init(struct sr_input *in)
 
 static int loadfile(struct sr_input *in, const char *filename)
 {
-       struct sr_datafeed_header header;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_meta_logic meta;
+       struct sr_datafeed_meta meta;
        struct sr_datafeed_logic logic;
+       struct sr_config *src;
        unsigned char buffer[CHUNKSIZE];
        int fd, size, num_probes;
        struct context *ctx;
@@ -114,18 +116,15 @@ static int loadfile(struct sr_input *in, const char *filename)
        num_probes = g_slist_length(in->sdi->probes);
 
        /* Send header packet to the session bus. */
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       packet.type = SR_DF_HEADER;
-       packet.payload = &header;
-       sr_session_send(in->sdi, &packet);
+       std_session_send_df_header(in->sdi, DRIVER_LOG_DOMAIN);
 
-       /* Send metadata about the SR_DF_LOGIC packets to come. */
-       packet.type = SR_DF_META_LOGIC;
-       packet.payload = &meta;
-       meta.samplerate = ctx->samplerate;
-       meta.num_probes = num_probes;
-       sr_session_send(in->sdi, &packet);
+       if (ctx->samplerate) {
+               packet.type = SR_DF_META;
+               packet.payload = &meta;
+               src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
+               meta.config = g_slist_append(NULL, src);
+               sr_session_send(in->sdi, &packet);
+       }
 
        /* Chop up the input file into chunks & send it to the session bus. */
        packet.type = SR_DF_LOGIC;