X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fasix-sigma.c;h=0eaaf97621ce966c1fc1eea39af5c11a06c03c16;hb=7237e91262251a138cf150f9fcfe7b05d0e5904b;hp=6e7f1fd716d52c04fd8c816348cb3088d2629e97;hpb=e8686e3ae36c190a88f1a15aebb7294bb6491578;p=libsigrok.git

diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c
index 6e7f1fd7..0eaaf976 100644
--- a/src/hardware/asix-sigma/asix-sigma.c
+++ b/src/hardware/asix-sigma/asix-sigma.c
@@ -28,7 +28,7 @@
 #include <ftdi.h>
 #include <string.h>
 #include <unistd.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "asix-sigma.h"
 
@@ -345,7 +345,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	(void)options;
 
-	drvc = di->priv;
+	drvc = di->context;
 
 	devices = NULL;
 
@@ -411,7 +411,7 @@ free:
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 /*
@@ -1517,7 +1517,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Add capture source. */
-	sr_session_source_add(sdi->session, 0, G_IO_IN, 10, receive_data, (void *)sdi);
+	sr_session_source_add(sdi->session, -1, 0, 10, receive_data, (void *)sdi);
 
 	devc->state.state = SIGMA_CAPTURE;
 
@@ -1533,7 +1533,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	devc = sdi->priv;
 	devc->state.state = SIGMA_IDLE;
 
-	sr_session_source_remove(sdi->session, 0);
+	sr_session_source_remove(sdi->session, -1);
 
 	return SR_OK;
 }
@@ -1554,5 +1554,5 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };