drivers: Match dummy FD passed to source add/remove

[libsigrok.git] / src / hardware / uni-t-dmm / api.c

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 40ef808aee43a7c34caa5b441fef687945e0ef4b..b92d5d140561a0b50daf3ad5e8f91970e0526dd1 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -66,7 +66,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        struct sr_config *src;
        const char *conn;
 
-       drvc = di->priv;
+       drvc = di->context;
        dmm = (struct dmm_info *)di;
 
        conn = NULL;
@@ -109,7 +109,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -120,7 +120,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        int ret;
 
        di = sdi->driver;
-       drvc = di->priv;
+       drvc = di->context;
        usb = sdi->conn;
 
        if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
@@ -201,7 +201,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
 
-       sr_session_source_add(sdi->session, 0, 0, 10 /* poll_timeout */,
+       sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
                      uni_t_dmm_receive_data, (void *)sdi);
 
        return SR_OK;
@@ -220,7 +220,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        packet.type = SR_DF_END;
        sr_session_send(sdi, &packet);
 
-       sr_session_source_remove(sdi->session, 0);
+       sr_session_source_remove(sdi->session, -1);
 
        return SR_OK;
 }
@@ -244,7 +244,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
                        .dev_close = dev_close, \
                        .dev_acquisition_start = dev_acquisition_start, \
                        .dev_acquisition_stop = dev_acquisition_stop, \
-                       .priv = NULL, \
+                       .context = NULL, \
                }, \
                VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
                VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \