X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=f1c01918222e6827d1f14bd7529d5a5f4be9551b;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=27e8cdc92ba9534203c28fbc79d7aa6aa585fdd4;hpb=9f45fb3aea9aa628ec2323bac8f2c354f5f3983c;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index 27e8cdc9..f1c01918 100644
--- 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) 2010-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;
@@ -108,17 +107,13 @@ static int feed_chunk(int fd, int revents, void *session_data)
 
 		if (!(buf = g_try_malloc(CHUNKSIZE))) {
 			sr_err("session: %s: buf malloc failed", __func__);
-			// return SR_ERR_MALLOC;
-			return FALSE;
+			return FALSE; /* TODO: SR_ERR_MALLOC */
 		}
 
 		ret = zip_fread(vdevice->capfile, buf, CHUNKSIZE);
 		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 +149,6 @@ static void hw_cleanup(void);
  */
 static int hw_init(const char *deviceinfo)
 {
-	hw_cleanup();
 
 	sessionfile = g_strdup(deviceinfo);
 
@@ -220,7 +214,7 @@ static int hw_get_status(int device_index)
 	/* Avoid compiler warnings. */
 	(void)device_index;
 
-	if (sr_device_list() != NULL)
+	if (sr_dev_list() != NULL)
 		return SR_OK;
 	else
 		return SR_ERR;
@@ -292,20 +286,21 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 		vdevice->capturefile);
 
 	if (!(vdevice->archive = zip_open(sessionfile, 0, &err))) {
-		sr_warn("Failed to open session file '%s': zip error %d\n",
-			sessionfile, err);
+		sr_err("Failed to open session file '%s': zip error %d\n",
+		       sessionfile, err);
 		return SR_ERR;
 	}
 
 	if (zip_stat(vdevice->archive, vdevice->capturefile, 0, &zs) == -1) {
-		sr_warn("Failed to check capture file '%s' in session file '%s'.",
-			vdevice->capturefile, sessionfile);
+		sr_err("Failed to check capture file '%s' in session file "
+		       "'%s'.", vdevice->capturefile, sessionfile);
 		return SR_ERR;
 	}
 
-	if (!(vdevice->capfile = zip_fopen(vdevice->archive, vdevice->capturefile, 0))) {
-		sr_warn("Failed to open capture file '%s' in session file '%s'.",
-			vdevice->capturefile, sessionfile);
+	if (!(vdevice->capfile = zip_fopen(vdevice->archive,
+					   vdevice->capturefile, 0))) {
+		sr_err("Failed to open capture file '%s' in session file '%s'.",
+		       vdevice->capturefile, sessionfile);
 		return SR_ERR;
 	}
 
@@ -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);