X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fkecheng-kc-330b%2Fprotocol.c;h=1bca7520c8cddf09fc7f8e485e81f93bdff538d6;hb=069d9f25d9f63e35885a7e4c83e8587f0356d8f9;hp=caf896ac051204e62dfab51e8eeba6137efd536c;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git
diff --git a/src/hardware/kecheng-kc-330b/protocol.c b/src/hardware/kecheng-kc-330b/protocol.c
index caf896ac..1bca7520 100644
--- a/src/hardware/kecheng-kc-330b/protocol.c
+++ b/src/hardware/kecheng-kc-330b/protocol.c
@@ -17,15 +17,16 @@
* along with this program. If not, see .
*/
+#include
#include
#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 +41,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 +125,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;