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 689e1da7d27caab9c7f42c854f62fc5f80e9ee54..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
@@ -23,11 +23,11 @@
 #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;
@@ -47,26 +47,46 @@ 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;
        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;
@@ -95,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;
@@ -124,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;
@@ -194,6 +221,12 @@ static int hw_get_status(int device_index)
                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;
        }
 
@@ -285,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);