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, 20 insertions, 9 deletions

diff --git a/src/mkii.c b/src/mkii.c
index e2fb23f..742c1da 100644
--- a/src/mkii.c
+++ b/src/mkii.c
@@ -29,6 +29,9 @@
 #include "device.h"
 #include "usb-device.h"
 
+#define READ_DEV	0x81
+#define WRITE_DEV	0x01
+
 #define MKII_OUT	0x8810001B
 #define MKII_IN		0x8800101B
 
@@ -48,9 +51,9 @@ struct mkii_message {
 } __attribute__((__packed__));
 
 
-static int mkii_send_receive(usb_dev_handle * udev, uint8_t type, struct mkii_message * in_msg, size_t data_size, struct mkii_message * out_msg, size_t out_size) {
+static int mkii_send_receive(libusb_device_handle * udev, uint8_t type, struct mkii_message * in_msg, size_t data_size, struct mkii_message * out_msg, size_t out_size) {
 
-	int ret;
+	int ret, transferred;
 	static uint8_t number = 0;
 
 	in_msg->header = MKII_OUT;
@@ -59,15 +62,17 @@ static int mkii_send_receive(usb_dev_handle * udev, uint8_t type, struct mkii_me
 	in_msg->num = number++;
 	in_msg->type = type;
 
-	ret = usb_bulk_write(udev, 1, (char *)in_msg, data_size + sizeof(*in_msg), 5000);
+	ret = libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)in_msg, data_size + sizeof(*in_msg), &transferred, 5000);
 	if ( ret < 0 )
 		return ret;
-	if ( (size_t)ret != data_size + sizeof(*in_msg) )
+	if ( (size_t)transferred != data_size + sizeof(*in_msg) )
 		return -1;
 
-	ret = usb_bulk_read(udev, 129, (char *)out_msg, out_size, 5000);
+	ret = libusb_bulk_transfer(udev, READ_DEV, (unsigned char *)out_msg, out_size, &transferred, 5000);
 	if ( ret < 0 )
 		return ret;
+	if ( (size_t)transferred < sizeof(*out_msg) )
+		return -1;
 
 	if ( out_msg->header != MKII_IN )
 		return -1;
@@ -75,13 +80,13 @@ static int mkii_send_receive(usb_dev_handle * udev, uint8_t type, struct mkii_me
 	if ( out_msg->type != (type | MKII_RESPONCE) )
 		return -1;
 
-	if ( (size_t)ret < sizeof(*out_msg) )
+	if ( (size_t)transferred < sizeof(*out_msg) )
 		return -1;
 
-	if ( ntohs(out_msg->size) != ret - sizeof(*out_msg) + 4 )
+	if ( ntohs(out_msg->size) != transferred - sizeof(*out_msg) + 4 )
 		return -1;
 
-	return ret - sizeof(*out_msg);
+	return transferred - sizeof(*out_msg);
 
 }
 
@@ -94,6 +99,8 @@ int mkii_init(struct usb_device_info * dev) {
 	char * newptr;
 	char * ptr;
 	enum image_type type;
+	struct libusb_device *udev;
+	struct libusb_config_descriptor *desc;
 
 	printf("Initializing Mk II protocol...\n");
 
@@ -154,7 +161,11 @@ int mkii_init(struct usb_device_info * dev) {
 	printf("\n");
 
 	memset(buf, 0, sizeof(buf));
-	usb_get_string_simple(dev->udev, usb_device(dev->udev)->config[dev->flash_device->configuration].iConfiguration, buf, sizeof(buf));
+
+	udev = libusb_get_device(dev->udev);
+	ret = libusb_get_config_descriptor(udev, dev->flash_device->configuration, &desc);
+	if ( ret == 0 )
+		libusb_get_string_descriptor_ascii(dev->udev, desc->iConfiguration, (unsigned char*)buf, sizeof(buf));
 	if ( strncmp(buf, "Firmware Upgrade Configuration", sizeof("Firmware Upgrade Configuration")) == 0 )
 		dev->data |= (1UL << 31);