datastore.c: Improve error handling and docs.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index f0b4b0f98529f12a4d857497a05359d08018d71b..fd5b11fc55cab186aa6e6d3ccd034811e2e4c965 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -70,9 +70,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");
 
@@ -119,9 +119,11 @@ static int feed_chunk(int fd, int revents, void *session_data)
 }
 
 /* driver callbacks */
+static void hw_cleanup(void);
 
 static int hw_init(const char *deviceinfo)
 {
+       hw_cleanup();
 
        sessionfile = g_strdup(deviceinfo);
 
@@ -135,6 +137,11 @@ static void hw_cleanup(void)
        for (l = device_instances; l; l = l->next)
                sr_device_instance_free(l->data);
 
+       g_slist_free(device_instances);
+       device_instances = NULL;
+
+       sr_session_source_remove(-1);
+
        g_free(sessionfile);
 
 }
@@ -176,9 +183,8 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-
-       /* avoid compiler warning */
-       device_index = device_index;
+       /* Avoid compiler warnings. */
+       (void)device_index;
 
        if (devices)
                return SR_OK;
@@ -231,8 +237,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;
@@ -276,7 +282,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);