We now require libusb >= 1.0.9.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index bf6dd8ed546a1c9bc2cf3765b776e23d79973671..6ba804285b5d0ff8b2815c062cb879a823baad74 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -47,15 +47,6 @@ static const int hwcaps[] = {
        0,
 };
 
-/**
- * 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;
@@ -81,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);
@@ -108,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;
@@ -116,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;
@@ -141,8 +122,6 @@ static int hw_cleanup(void)
        g_slist_free(dev_insts);
        dev_insts = NULL;
 
-       sr_session_source_remove(-1);
-
        return SR_OK;
 }
 
@@ -182,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)
 {
@@ -310,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,