X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=a994213df18b04ba48466248f1d656d723a88c32;hb=dff75c0df1be07db2e63ef242e843c925779bddb;hp=b7cd5f14916816064bfa05384ed31bed04bb63a2;hpb=805e9640ff4a28dc470afb0b4f3b02aece44179b;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index b7cd5f14..a994213d 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) 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
@@ -23,16 +23,17 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* size of payloads sent across the session bus */
-#define CHUNKSIZE 4096
+#define CHUNKSIZE (512 * 1024)
 
 struct session_vdevice {
 	char *capturefile;
 	struct zip *archive;
 	struct zip_file *capfile;
+	int bytes_read;
 	uint64_t samplerate;
 	int unitsize;
 	int num_probes;
@@ -46,20 +47,40 @@ static int capabilities[] = {
 	0,
 };
 
-
+/**
+ * TODO.
+ *
+ * @param device_index TODO.
+ */
 static struct session_vdevice *get_vdevice_by_index(int device_index)
 {
 	struct sr_device_instance *sdi;
 	struct session_vdevice *vdevice;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+	/* TODO: Sanity checks on device_index. */
+
+	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+		sr_err("session driver: %s: device instance with device "
+		       "index %d was not found", __func__, device_index);
 		return NULL;
+	}
+
+	/* TODO: Is sdi->priv == NULL valid? */
 
 	vdevice = sdi->priv;
 
 	return vdevice;
 }
 
+/**
+ * TODO.
+ *
+ * @param fd TODO.
+ * @param revents TODO.
+ * @param session_data TODO.
+ *
+ * @return TODO.
+ */
 static int feed_chunk(int fd, int revents, void *session_data)
 {
 	struct sr_device_instance *sdi;
@@ -70,9 +91,9 @@ static int feed_chunk(int fd, int revents, void *session_data)
 	void *buf;
 	int ret, got_data;
 
-	/* avoid compiler warning */
-	fd = fd;
-	revents = revents;
+	/* Avoid compiler warnings. */
+	(void)fd;
+	(void)revents;
 
 	sr_dbg("session_driver: feed chunk");
 
@@ -94,12 +115,11 @@ static int feed_chunk(int fd, int revents, void *session_data)
 		if (ret > 0) {
 			got_data = TRUE;
 			packet.type = SR_DF_LOGIC;
-			packet.timeoffset = 0;
-			packet.duration = 0;
 			packet.payload = &logic;
 			logic.length = ret;
 			logic.unitsize = vdevice->unitsize;
 			logic.data = buf;
+			vdevice->bytes_read += ret;
 			sr_session_bus(session_data, &packet);
 		} else {
 			/* done with this capture file */
@@ -121,15 +141,25 @@ static int feed_chunk(int fd, int revents, void *session_data)
 /* driver callbacks */
 static void hw_cleanup(void);
 
+/**
+ * TODO.
+ *
+ * @param deviceinfo TODO.
+ *
+ * @return TODO.
+ */
 static int hw_init(const char *deviceinfo)
 {
-	hw_cleanup();
 
 	sessionfile = g_strdup(deviceinfo);
 
 	return 0;
 }
 
+/**
+ * TODO.
+ *
+ */
 static void hw_cleanup(void)
 {
 	GSList *l;
@@ -143,7 +173,6 @@ static void hw_cleanup(void)
 	sr_session_source_remove(-1);
 
 	g_free(sessionfile);
-
 }
 
 static int hw_opendev(int device_index)
@@ -183,19 +212,23 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
+	/* Avoid compiler warnings. */
+	(void)device_index;
 
-	/* avoid compiler warning */
-	device_index = device_index;
-
-	if (devices)
+	if (sr_device_list() != NULL)
 		return SR_OK;
 	else
 		return SR_ERR;
 }
 
+/**
+ * Get the list of hardware capabilities.
+ *
+ * @return A pointer to the (hardware) capabilities of this virtual session
+ *         driver. This could be NULL, if no such capabilities exist.
+ */
 static int *hw_get_capabilities(void)
 {
-
 	return capabilities;
 }
 
@@ -211,9 +244,13 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 	case SR_HWCAP_SAMPLERATE:
 		tmp_u64 = value;
 		vdevice->samplerate = *tmp_u64;
+		sr_info("session driver: setting samplerate to %" PRIu64,
+		        vdevice->samplerate);
 		break;
 	case SR_HWCAP_CAPTUREFILE:
 		vdevice->capturefile = g_strdup(value);
+		sr_info("session driver: setting capturefile to %s",
+		        vdevice->capturefile);
 		break;
 	case SR_HWCAP_CAPTURE_UNITSIZE:
 		tmp_u64 = value;
@@ -224,6 +261,8 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 		vdevice->num_probes = *tmp_u64;
 		break;
 	default:
+		sr_err("session driver: %s: unknown capability %d requested",
+		       __func__, capability);
 		return SR_ERR;
 	}
 
@@ -238,8 +277,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	struct sr_datafeed_packet *packet;
 	int err;
 
-	/* avoid compiler warning */
-	session_device_id = session_device_id;
+	/* Avoid compiler warnings. */
+	(void)session_device_id;
 
 	if (!(vdevice = get_vdevice_by_index(device_index)))
 		return SR_ERR;
@@ -283,7 +322,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	packet->payload = (unsigned char *)header;
 	header->feed_version = 1;
 	gettimeofday(&header->starttime, NULL);
-	header->samplerate = 0;
+	header->samplerate = vdevice->samplerate;
 	header->num_logic_probes = vdevice->num_probes;
 	header->num_analog_probes = 0;
 	sr_session_bus(session_device_id, packet);
@@ -293,6 +332,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	return SR_OK;
 }
 
+/* Not static, it's used elsewhere (via 'extern'). */
 struct sr_device_plugin session_driver = {
 	"session",
 	"Session-emulating driver",