Build: Include <config.h> first in all source files

[libsigrok.git] / src / hardware / sysclk-lwla / api.c

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 1d68ba4ab68a88720c8fea832f61c7062285acc7..98b1b7c657264d2c844a412d7f602ed6f0ad232c 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -17,11 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <libusb.h>
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -118,7 +119,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        struct sr_config *src;
        const char *conn;
 
-       drvc = di->priv;
+       drvc = di->context;
        conn = USB_VID_PID;
 
        for (node = options; node != NULL; node = node->next) {
@@ -158,7 +159,7 @@ static GSList *dev_list(const struct sr_dev_driver *di)
 {
        struct drv_context *drvc;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        return drvc->instances;
 }
@@ -186,7 +187,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        struct sr_usb_dev_inst *usb;
        int ret;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        if (!drvc) {
                sr_err("Driver was not initialized.");
@@ -220,7 +221,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
        struct sr_usb_dev_inst *usb;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -482,7 +483,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR_DEV_CLOSED;
 
        devc = sdi->priv;
-       drvc = di->priv;
+       drvc = di->context;
 
        if (devc->acquisition) {
                sr_err("Acquisition still in progress?");
@@ -557,5 +558,5 @@ SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };