[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION

From: Philippe Mathieu-Daudé
Subject: Re: [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION
Date: Mon, 3 Apr 2017 09:39:57 -0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0

On 04/03/2017 07:52 AM, Gerd Hoffmann wrote:
libusbx doesn't exist any more, the fork got merged back to libusb.  So
stop using LIBUSBX_API_VERSION and use LIBUSB_API_VERSION instead.  For
backward compatibility alias LIBUSB_API_VERSION to LIBUSBX_API_VERSION
in case we figure LIBUSB_API_VERSION isn't defined.

Signed-off-by: Gerd Hoffmann <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

 hw/usb/host-libusb.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index c9876a5..f9c8eaf 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -159,7 +159,10 @@ static void usb_host_attach_kernel(USBHostDevice *s);
 #define BULK_TIMEOUT         0        /* unlimited */
 #define INTR_TIMEOUT         0        /* unlimited */

-#if LIBUSBX_API_VERSION >= 0x01000103
+#if LIBUSB_API_VERSION >= 0x01000103
 # define HAVE_STREAMS 1

@@ -269,7 +272,7 @@ static int usb_host_get_port(libusb_device *dev, char 
*port, size_t len)
     size_t off;
     int rc, i;

-#if LIBUSBX_API_VERSION >= 0x01000102
+#if LIBUSB_API_VERSION >= 0x01000102
     rc = libusb_get_port_numbers(dev, path, 7);
     rc = libusb_get_port_path(ctx, dev, path, 7);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]