]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/colead-slm/api.c
Build: Set local include directories in Makefile.am
[libsigrok.git] / src / hardware / colead-slm / api.c
index a60444010f23b257820e994971b8e60a0e01da15..0e2c9198fe16165ad05b9fdb928a0702d7db8589 100644 (file)
@@ -21,9 +21,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -58,7 +57,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        GSList *devices, *l;
        const char *conn, *serialcomm;
 
-       drvc = di->priv;
+       drvc = di->context;
        drvc->instances = NULL;
 
        devices = NULL;
@@ -98,7 +97,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)
@@ -219,5 +218,5 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };