sr: initial support for Hantek 2xxx/5200 USB oscilloscopes

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index 17a8473c0973259c37ae36ced750fff85926cfaf..32b8e905fc26a0253fb540e8a5d8550434701014 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -77,11 +77,11 @@ static struct session_vdev *get_vdev_by_index(int dev_index)
  *
  * @param fd TODO.
  * @param revents TODO.
- * @param session_data TODO.
+ * @param cb_data TODO.
  *
  * @return TODO.
  */
-static int feed_chunk(int fd, int revents, void *session_data)
+static int receive_data(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct session_vdev *vdev;
@@ -120,7 +120,7 @@ static int feed_chunk(int fd, int revents, void *session_data)
                        logic.unitsize = vdev->unitsize;
                        logic.data = buf;
                        vdev->bytes_read += ret;
-                       sr_session_bus(session_data, &packet);
+                       sr_session_send(cb_data, &packet);
                } else {
                        /* done with this capture file */
                        zip_fclose(vdev->capfile);
@@ -132,7 +132,7 @@ static int feed_chunk(int fd, int revents, void *session_data)
 
        if (!got_data) {
                packet.type = SR_DF_END;
-               sr_session_bus(session_data, &packet);
+               sr_session_send(cb_data, &packet);
        }
 
        return TRUE;
@@ -157,7 +157,6 @@ static int hw_init(const char *devinfo)
 
 /**
  * TODO.
- *
  */
 static int hw_cleanup(void)
 {
@@ -232,7 +231,7 @@ static int *hw_hwcap_get_all(void)
        return hwcaps;
 }
 
-static int hw_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, void *value)
 {
        struct session_vdev *vdev;
        uint64_t *tmp_u64;
@@ -269,16 +268,14 @@ static int hw_config_set(int dev_index, int hwcap, void *value)
        return SR_OK;
 }
 
-static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 {
        struct zip_stat zs;
        struct session_vdev *vdev;
        struct sr_datafeed_header *header;
        struct sr_datafeed_packet *packet;
-       int err;
-
-       /* Avoid compiler warnings. */
-       (void)session_dev_id;
+       struct sr_datafeed_meta_logic meta;
+       int ret;
 
        if (!(vdev = get_vdev_by_index(dev_index)))
                return SR_ERR;
@@ -286,9 +283,9 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
        sr_info("session_driver: opening archive %s file %s", sessionfile,
                vdev->capturefile);
 
-       if (!(vdev->archive = zip_open(sessionfile, 0, &err))) {
+       if (!(vdev->archive = zip_open(sessionfile, 0, &ret))) {
                sr_err("session driver: Failed to open session file '%s': "
-                      "zip error %d\n", sessionfile, err);
+                      "zip error %d\n", sessionfile, ret);
                return SR_ERR;
        }
 
@@ -305,7 +302,7 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
        }
 
        /* freewheeling source */
-       sr_session_source_add(-1, 0, 0, feed_chunk, session_dev_id);
+       sr_session_source_add(-1, 0, 0, receive_data, cb_data);
 
        if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
                sr_err("session driver: %s: packet malloc failed", __func__);
@@ -322,16 +319,22 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
        packet->payload = (unsigned char *)header;
        header->feed_version = 1;
        gettimeofday(&header->starttime, NULL);
-       header->samplerate = vdev->samplerate;
-       header->num_logic_probes = vdev->num_probes;
-       sr_session_bus(session_dev_id, packet);
+       sr_session_send(cb_data, packet);
+
+       /* Send metadata about the SR_DF_LOGIC packets to come. */
+       packet->type = SR_DF_META_LOGIC;
+       packet->payload = &meta;
+       meta.samplerate = vdev->samplerate;
+       meta.num_probes = vdev->num_probes;
+       sr_session_send(cb_data, packet);
+
        g_free(header);
        g_free(packet);
 
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_plugin session_driver = {
+SR_PRIV struct sr_dev_driver session_driver = {
        .name = "session",
        .longname = "Session-emulating driver",
        .api_version = 1,
@@ -342,7 +345,7 @@ SR_PRIV struct sr_dev_plugin session_driver = {
        .dev_info_get = hw_dev_info_get,
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
-       .config_set = hw_config_set,
+       .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = NULL,
 };