File fix_unknown_types_declarations.diff of Package libsigrok

Overview Repositories Revisions Requests Users Attributes Meta

File fix_unknown_types_declarations.diff of Package libsigrok (Revision c88583c6249d91e8297a1bd64a8366e2)

Currently displaying revision c88583c6249d91e8297a1bd64a8366e2 , Show latest

diff --git a/src/hardware/asix-sigma/protocol.h b/src/hardware/asix-sigma/protocol.h
index d654e60..b2a7dec 100644
--- a/src/hardware/asix-sigma/protocol.h
+++ b/src/hardware/asix-sigma/protocol.h
@@ -24,6 +24,7 @@
 
 #include <stdint.h>
 #include <glib.h>
+#include <sys/types.h>
 #include <ftdi.h>
 #include <string.h>
 #include <libsigrok/libsigrok.h>
diff --git a/src/hardware/brymen-dmm/protocol.c b/src/hardware/brymen-dmm/protocol.c
index 4db460a..2834075 100644
--- a/src/hardware/brymen-dmm/protocol.c
+++ b/src/hardware/brymen-dmm/protocol.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include <sys/types.h>
 #include "protocol.h"
 
 static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 12fc9e2..6101a26 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -240,6 +240,7 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
 			break;
 		}
 
+#define LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER 0x0101
 		if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) {
 			if (libusb_kernel_driver_active(usb->devhdl, USB_INTERFACE) == 1) {
 				if ((ret = libusb_detach_kernel_driver(usb->devhdl, USB_INTERFACE)) < 0) {
diff --git a/src/hardware/ikalogic-scanaplus/protocol.h b/src/hardware/ikalogic-scanaplus/protocol.h
index cdd684d..bd6fc9a 100644
--- a/src/hardware/ikalogic-scanaplus/protocol.h
+++ b/src/hardware/ikalogic-scanaplus/protocol.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
+#include <sys/types.h>
 #include <ftdi.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index c2bd2cc..139a028 100644
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
+#include <sys/types.h>
 #include <ftdi.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index 0c37886..e23f1ff 100644
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -188,6 +188,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
+#define LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER 0x0101
 	if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) {
 		if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
 			if ((ret = libusb_detach_kernel_driver(usb->devhdl, 0)) < 0) {
diff --git a/src/serial.c b/src/serial.c
index 27244da..9a1ef43 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
diff --git a/src/usb.c b/src/usb.c
index 35a3e80..a5fef9a 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -487,7 +487,12 @@ SR_PRIV int usb_get_port_path(libusb_device *dev, char *path, int path_len)
 	if (libusb_open(dev, &devh) != 0)
 		return SR_ERR;
 #endif
+#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000102)
 	n = libusb_get_port_numbers(dev, port_numbers, sizeof(port_numbers));
+#else
+	n = 1;
+	port_numbers[0] = libusb_get_device_address(dev);
+#endif
 #if defined(__FreeBSD__) || defined(__APPLE__)
 	libusb_close(devh);
 #endif

Places

File fix_unknown_types_declarations.diff of Package libsigrok (Revision c88583c6249d91e8297a1bd64a8366e2)

Places