Commit 102a3d84 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Peter Maydell
Browse files

usb-host: switch to LIBUSB_API_VERSION 



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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 20170403105238.23262-1-kraxel@redhat.com
parent 230f4c6b

hw/usb/host-libusb.c

+5 −2
Original line number Diff line number Diff line
@@ -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

#ifndef LIBUSB_API_VERSION

# define LIBUSB_API_VERSION LIBUSBX_API_VERSION

#endif

#if LIBUSB_API_VERSION >= 0x01000103

# define HAVE_STREAMS 1

#endif
@@ -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);

#else

    rc = libusb_get_port_path(ctx, dev, path, 7);