Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / kecheng-kc-330b / protocol.c

diff --git a/src/hardware/kecheng-kc-330b/protocol.c b/src/hardware/kecheng-kc-330b/protocol.c
index caf896ac051204e62dfab51e8eeba6137efd536c..d79a92a56b449a1d4385bb8e576492d5489e6d21 100644 (file)
--- a/src/hardware/kecheng-kc-330b/protocol.c
+++ b/src/hardware/kecheng-kc-330b/protocol.c
@@ -21,11 +21,11 @@
 #include "protocol.h"
 
 extern struct sr_dev_driver kecheng_kc_330b_driver_info;
-static struct sr_dev_driver *di = &kecheng_kc_330b_driver_info;
 extern const uint64_t kecheng_kc_330b_sample_intervals[][2];
 
 SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data)
 {
+       struct sr_dev_driver *di;
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
@@ -40,10 +40,11 @@ SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data)
        (void)fd;
        (void)revents;
 
-       drvc = di->priv;
        sdi = cb_data;
        devc = sdi->priv;
        usb = sdi->conn;
+       di = sdi->driver;
+       drvc = di->context;
 
        memset(&tv, 0, sizeof(struct timeval));
        libusb_handle_events_timeout_completed(drvc->sr_ctx->libusb_ctx, &tv,
@@ -123,7 +124,7 @@ static void send_data(const struct sr_dev_inst *sdi, void *buf, unsigned int buf
 
 }
 
-SR_PRIV void kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer)
 {
        struct dev_context *devc;
        struct sr_dev_inst *sdi;