Build: Set local include directories in Makefile.am

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index d0b9e482af0440fee5a34f10ad719194fd1a9fec..fe3e231616e67c13989be8340cb74dcddd7195ae 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -360,7 +360,7 @@ SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc)
 SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver)
 {
        if (driver && driver->dev_list)
-               return driver->dev_list();
+               return driver->dev_list(driver);
        else
                return NULL;
 }
@@ -386,7 +386,7 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
        }
 
        if (driver->dev_clear)
-               ret = driver->dev_clear();
+               ret = driver->dev_clear(driver);
        else
                ret = std_dev_clear(driver, NULL);
 
@@ -520,11 +520,10 @@ SR_API const char *sr_dev_inst_sernum_get(const struct sr_dev_inst *sdi)
  */
 SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
 {
+#ifdef HAVE_LIBUSB_1_0
        struct drv_context *drvc;
        int r, cnt, i, a, b;
        char connection_id[64];
-
-#ifdef HAVE_LIBUSB_1_0
        struct sr_usb_dev_inst *usb;
        struct libusb_device **devlist;
        struct libusb_device_descriptor des;
@@ -544,12 +543,11 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
        }
 #endif
 
-
 #ifdef HAVE_LIBUSB_1_0
        if ((!sdi->connection_id) && (sdi->inst_type == SR_INST_USB)) {
                /* connection_id isn't populated, let's do that here. */
 
-               drvc = sdi->driver->priv;
+               drvc = sdi->driver->context;
                usb = sdi->conn;
 
                if ((cnt = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist)) < 0) {