libsigrok.pc: Add Required.private field entries.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index b69cf2435015a193024457c7e44bb1d7cdc0b6bf..f0b4b0f98529f12a4d857497a05359d08018d71b 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -60,11 +60,12 @@ static struct session_vdevice *get_vdevice_by_index(int device_index)
        return vdevice;
 }
 
-static int feed_chunk(int fd, int revents, void *user_data)
+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;
        GSList *l;
        void *buf;
        int ret, got_data;
@@ -83,15 +84,23 @@ static int feed_chunk(int fd, int revents, void *user_data)
                        /* already done with this instance */
                        continue;
 
-               buf = g_malloc(CHUNKSIZE);
+               if (!(buf = g_try_malloc(CHUNKSIZE))) {
+                       sr_err("session: %s: buf malloc failed", __func__);
+                       // return SR_ERR_MALLOC;
+                       return FALSE;
+               }
+
                ret = zip_fread(vdevice->capfile, buf, CHUNKSIZE);
                if (ret > 0) {
                        got_data = TRUE;
                        packet.type = SR_DF_LOGIC;
-                       packet.length = ret;
-                       packet.unitsize = vdevice->unitsize;
-                       packet.payload = buf;
-                       sr_session_bus(user_data, &packet);
+                       packet.timeoffset = 0;
+                       packet.duration = 0;
+                       packet.payload = &logic;
+                       logic.length = ret;
+                       logic.unitsize = vdevice->unitsize;
+                       logic.data = buf;
+                       sr_session_bus(session_data, &packet);
                } else {
                        /* done with this capture file */
                        zip_fclose(vdevice->capfile);
@@ -103,8 +112,7 @@ static int feed_chunk(int fd, int revents, void *user_data)
 
        if (!got_data) {
                packet.type = SR_DF_END;
-               packet.length = 0;
-               sr_session_bus(user_data, &packet);
+               sr_session_bus(session_data, &packet);
        }
 
        return TRUE;
@@ -139,9 +147,12 @@ static int hw_opendev(int device_index)
                NULL, NULL, NULL);
        if (!sdi)
                return SR_ERR;
-       sdi->priv = g_malloc0(sizeof(struct session_vdevice));
-       if (!sdi->priv)
-               return SR_ERR;
+
+       if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdevice)))) {
+               sr_err("session: %s: sdi->priv malloc failed", __func__);
+               return SR_ERR_MALLOC;
+       }
+
        device_instances = g_slist_append(device_instances, sdi);
 
        return SR_OK;
@@ -250,18 +261,22 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        /* freewheeling source */
        sr_session_source_add(-1, 0, 0, feed_chunk, session_device_id);
 
+       if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
+               sr_err("session: %s: packet malloc failed", __func__);
+               return SR_ERR_MALLOC;
+       }
+
+       if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
+               sr_err("session: %s: header malloc failed", __func__);
+               return SR_ERR_MALLOC;
+       }
+
        /* Send header packet to the session bus. */
-       packet = g_malloc(sizeof(struct sr_datafeed_packet));
-       header = g_malloc(sizeof(struct sr_datafeed_header));
-       if (!packet || !header)
-               return SR_ERR;
        packet->type = SR_DF_HEADER;
-       packet->length = sizeof(struct sr_datafeed_header);
        packet->payload = (unsigned char *)header;
        header->feed_version = 1;
        gettimeofday(&header->starttime, NULL);
        header->samplerate = 0;
-       header->protocol_id = SR_PROTO_RAW;
        header->num_logic_probes = vdevice->num_probes;
        header->num_analog_probes = 0;
        sr_session_bus(session_device_id, packet);
@@ -271,7 +286,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        return SR_OK;
 }
 
-
 struct sr_device_plugin session_driver = {
        "session",
        "Session-emulating driver",