sr/cli/gtk: Remove analog left-overs from API.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index 27e8cdc92ba9534203c28fbc79d7aa6aa585fdd4..0c1d0d20de0465ee622a09da8b660d7208e5ff60 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 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
@@ -27,7 +27,7 @@
 #include "sigrok-internal.h"
 
 /* size of payloads sent across the session bus */
-#define CHUNKSIZE 4096
+#define CHUNKSIZE (512 * 1024)
 
 struct session_vdevice {
        char *capturefile;
@@ -87,7 +87,6 @@ static int feed_chunk(int fd, int revents, void *session_data)
        struct session_vdevice *vdevice;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
-       uint64_t sample_period_ps;
        GSList *l;
        void *buf;
        int ret, got_data;
@@ -116,9 +115,6 @@ static int feed_chunk(int fd, int revents, void *session_data)
                if (ret > 0) {
                        got_data = TRUE;
                        packet.type = SR_DF_LOGIC;
-                       sample_period_ps = 1000000000000 / vdevice->samplerate;
-                       packet.timeoffset = sample_period_ps * (vdevice->bytes_read / vdevice->unitsize);
-                       packet.duration = sample_period_ps * (ret / vdevice->unitsize);
                        packet.payload = &logic;
                        logic.length = ret;
                        logic.unitsize = vdevice->unitsize;
@@ -154,7 +150,6 @@ static void hw_cleanup(void);
  */
 static int hw_init(const char *deviceinfo)
 {
-       hw_cleanup();
 
        sessionfile = g_strdup(deviceinfo);
 
@@ -329,7 +324,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        gettimeofday(&header->starttime, NULL);
        header->samplerate = vdevice->samplerate;
        header->num_logic_probes = vdevice->num_probes;
-       header->num_analog_probes = 0;
        sr_session_bus(session_device_id, packet);
        g_free(header);
        g_free(packet);