Attachment 197056 Details for Bug 231264 – LibUSB patch

[patch] LibUSB patch

libusb.diff (text/plain), 1.27 KB, created by Hans Petter Selasky on 2018-09-12 15:26:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans Petter Selasky

Created: 2018-09-12 15:26:10 UTC

Size: 1.27 KB

patch

obsolete

>Index: libusb10_io.c
>===================================================================
>--- libusb10_io.c	(revision 338616)
>+++ libusb10_io.c	(working copy)
>@@ -489,6 +489,19 @@
> 	return (actlen);
> }
> 
>+static libusb_context *
>+libusb10_get_context_by_device_handle(libusb_device_handle *devh)
>+{
>+	libusb_context *ctx = NULL;
>+
>+	if (devh != NULL)
>+		ctx = libusb_get_device(devh)->ctx;
>+	else
>+		ctx = NULL;
>+
>+	return (GET_CONTEXT(ctx));
>+}
>+
> static void
> libusb10_do_transfer_cb(struct libusb_transfer *transfer)
> {
>@@ -495,7 +508,7 @@
> 	libusb_context *ctx;
> 	int *pdone;
> 
>-	ctx = GET_CONTEXT(NULL);
>+	ctx = libusb10_get_context_by_device_handle(transfer->dev_handle);
> 
> 	DPRINTF(ctx, LIBUSB_DEBUG_TRANSFER, "sync I/O done");
> 
>@@ -585,7 +598,8 @@
> 	libusb_context *ctx;
> 	int ret;
> 
>-	ctx = GET_CONTEXT(NULL);
>+	ctx = libusb10_get_context_by_device_handle(devh);
>+
> 	DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_bulk_transfer enter");
> 
> 	ret = libusb10_do_transfer(devh, endpoint, data, length, transferred,
>@@ -603,7 +617,8 @@
> 	libusb_context *ctx;
> 	int ret;
> 
>-	ctx = GET_CONTEXT(NULL);
>+	ctx = libusb10_get_context_by_device_handle(devh);
>+
> 	DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_interrupt_transfer enter");
> 
> 	ret = libusb10_do_transfer(devh, endpoint, data, length, transferred,

Actions: View | Diff

Attachments on bug 231264: 197047 | 197056 | 197089