We now require libusb >= 1.0.9.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index ce5c665c54ee47db6b1293b7d4a975e38a35e932..6ba804285b5d0ff8b2815c062cb879a823baad74 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -47,40 +47,6 @@ static const int hwcaps[] = {
        0,
 };
 
-/**
- * TODO.
- *
- * @param dev_index TODO.
- */
-static struct session_vdev *get_vdev_by_index(int dev_index)
-{
-       struct sr_dev_inst *sdi;
-       struct session_vdev *vdev;
-
-       /* TODO: Sanity checks on dev_index. */
-
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-               sr_err("session driver: %s: device instance with device "
-                      "index %d was not found", __func__, dev_index);
-               return NULL;
-       }
-
-       /* TODO: Is sdi->priv == NULL valid? */
-
-       vdev = sdi->priv;
-
-       return vdev;
-}
-
-/**
- * TODO.
- *
- * @param fd TODO.
- * @param revents TODO.
- * @param cb_data TODO.
- *
- * @return TODO.
- */
 static int receive_data(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi;
@@ -106,9 +72,8 @@ static int receive_data(int fd, int revents, void *cb_data)
                        continue;
 
                if (!(buf = g_try_malloc(CHUNKSIZE))) {
-                       sr_err("session driver: %s: buf malloc failed",
-                              __func__);
-                       return FALSE; /* TODO: SR_ERR_MALLOC */
+                       sr_err("session driver: %s: buf malloc failed", __func__);
+                       return FALSE;
                }
 
                ret = zip_fread(vdev->capfile, buf, CHUNKSIZE);
@@ -133,6 +98,7 @@ static int receive_data(int fd, int revents, void *cb_data)
        if (!got_data) {
                packet.type = SR_DF_END;
                sr_session_send(cb_data, &packet);
+               sr_session_source_remove(-1);
        }
 
        return TRUE;
@@ -141,22 +107,12 @@ static int receive_data(int fd, int revents, void *cb_data)
 /* driver callbacks */
 static int hw_cleanup(void);
 
-/**
- * TODO.
- *
- * @param devinfo TODO.
- *
- * @return TODO.
- */
 static int hw_init(void)
 {
 
        return SR_OK;
 }
 
-/**
- * TODO.
- */
 static int hw_cleanup(void)
 {
        GSList *l;
@@ -166,19 +122,11 @@ static int hw_cleanup(void)
        g_slist_free(dev_insts);
        dev_insts = NULL;
 
-       sr_session_source_remove(-1);
-
        return SR_OK;
 }
 
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-       struct sr_dev_inst *sdi;
-
-       sdi = sr_dev_inst_new(dev_index, SR_ST_INITIALIZING,
-                             NULL, NULL, NULL);
-       if (!sdi)
-               return SR_ERR;
 
        if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdev)))) {
                sr_err("session driver: %s: sdi->priv malloc failed", __func__);
@@ -213,17 +161,6 @@ static int hw_info_get(int info_id, const void **data,
        return SR_OK;
 }
 
-static int hw_dev_status_get(int dev_index)
-{
-       /* Avoid compiler warnings. */
-       (void)dev_index;
-
-       if (sr_dev_list() != NULL)
-               return SR_OK;
-       else
-               return SR_ERR;
-}
-
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                const void *value)
 {
@@ -266,7 +203,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
        return SR_OK;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+               void *cb_data)
 {
        struct zip_stat zs;
        struct session_vdev *vdev;
@@ -275,8 +213,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        struct sr_datafeed_meta_logic meta;
        int ret;
 
-       if (!(vdev = get_vdev_by_index(dev_index)))
-               return SR_ERR;
+       vdev = sdi->priv;
 
        sr_info("session_driver: opening archive %s file %s", vdev->sessionfile,
                vdev->capturefile);
@@ -341,7 +278,6 @@ SR_PRIV struct sr_dev_driver session_driver = {
        .dev_open = hw_dev_open,
        .dev_close = NULL,
        .info_get = hw_info_get,
-       .dev_status_get = hw_dev_status_get,
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = NULL,