X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.h;h=66a5cecf57919f0b2a6cbcf50d6d56624bc15805;hb=0c536bcd004aa4b4f0ba9673b4d460551e8b16c1;hp=5e7c7b3b40686e9a149681dbf747709f2c1566ed;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.h b/src/hardware/ikalogic-scanalogic2/protocol.h
index 5e7c7b3b..66a5cecf 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.h
+++ b/src/hardware/ikalogic-scanalogic2/protocol.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanalogic2"
@@ -34,7 +34,7 @@
 
 #define USB_VID_PID			"20a0.4123"
 #define USB_INTERFACE			0
-#define USB_TIMEOUT			5000
+#define USB_TIMEOUT_MS			(5 * 1000)
 
 #define USB_REQUEST_TYPE_IN		(LIBUSB_REQUEST_TYPE_CLASS | \
 	LIBUSB_RECIPIENT_INTERFACE | LIBUSB_ENDPOINT_IN)
@@ -217,8 +217,8 @@ struct dev_context {
 };
 
 SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV void sl2_receive_transfer_in(struct libusb_transfer *transfer);
-SR_PRIV void sl2_receive_transfer_out(struct libusb_transfer *transfer);
+SR_PRIV void LIBUSB_CALL sl2_receive_transfer_in(struct libusb_transfer *transfer);
+SR_PRIV void LIBUSB_CALL sl2_receive_transfer_out(struct libusb_transfer *transfer);
 SR_PRIV int sl2_set_samplerate(const struct sr_dev_inst *sdi,
 		uint64_t samplerate);
 SR_PRIV int sl2_set_limit_samples(const struct sr_dev_inst *sdi,