all: Switch to libusb-1.0

libusb 0.1 is deprecated. This updates 0xFFFF to use the
newer libusb 1.0 API instead.

1 files changed, 10 insertions, 4 deletions

diff --git a/src/disk.c b/src/disk.c
index daa3711..5988305 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -277,14 +277,20 @@ int disk_init(struct usb_device_info * dev) {
 	unsigned int devnum;
 	unsigned int busnum;
 
-	struct usb_device * device;
+	uint8_t usbdevnum;
+	uint8_t usbbusnum;
 
-	device = usb_device(dev->udev);
-	if ( ! device || ! device->bus ) {
+	struct libusb_device * device;
+
+	device = libusb_get_device(dev->udev);
+	if ( ! device ) {
 		ERROR_INFO("Cannot read usb devnum and busnum");
 		return -1;
 	}
 
+	usbbusnum = libusb_get_bus_number(device);
+	usbdevnum = libusb_get_port_number(device);
+
 	dir = opendir("/sys/dev/block/");
 	if ( ! dir ) {
 		ERROR_INFO("Cannot open '/sys/dev/block/' directory");
@@ -324,7 +330,7 @@ int disk_init(struct usb_device_info * dev) {
 
 		fclose(f);
 
-		if ( devnum != device->devnum || device->bus->location != busnum )
+		if ( devnum != usbdevnum || usbbusnum != busnum )
 			continue;
 
 		if ( sscanf(dirent->d_name, "%d:%d", &maj, &min) != 2 ) {