diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-04-18 12:16:44 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-04-23 08:43:10 +0200 |
| commit | 3f5cc97e2ba00b34fd20a5553ed9d2fecf32f7e3 (patch) | |
| tree | 3d249bb976f8fae53ea60361dbeedc2fa0f79d8d | |
| parent | 3b7e759a4110690c9617b1ffa6a7c96a343a330d (diff) | |
usb-host: raise libusbx minimum version to 1.0.13
Allows to remove one FIXME. Makes LIBUSB_LOG_LEVEL_WARNING build errors
go away. And starting with that version libusb has a LIBUSBX_API_VERSION
define which allows to easily #ifdef version dependencies should that
need arrive in the future.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | hw/usb/host-libusb.c | 5 |
2 files changed, 1 insertions, 6 deletions
@@ -3060,7 +3060,7 @@ fi # check for libusb if test "$libusb" != "no" ; then - if $pkg_config libusb-1.0 >/dev/null 2>&1 ; then + if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then libusb="yes" usb="libusb" libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 29f35b392..d1186b8a9 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -236,8 +236,6 @@ static int usb_host_init(void) static int usb_host_get_port(libusb_device *dev, char *port, size_t len) { -#if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x010000ff) - /* have libusb_get_port_path() */ uint8_t path[7]; size_t off; int rc, i; @@ -251,9 +249,6 @@ static int usb_host_get_port(libusb_device *dev, char *port, size_t len) off += snprintf(port+off, len-off, ".%d", path[i]); } return off; -#else - return snprintf(port, len, "FIXME"); -#endif } static void usb_host_libusb_error(const char *func, int rc) |