ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Gerd Hoffmann 2013-04-18 12:16:44 +02:00
parent 3b7e759a41
commit 3f5cc97e2b
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -3060,7 +3060,7 @@ fi
# check for libusb # check for libusb
if test "$libusb" != "no" ; then 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" libusb="yes"
usb="libusb" usb="libusb"
libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null) libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)

5
hw/usb/host-libusb.c
View File

@ -236,8 +236,6 @@ static int usb_host_init(void)
static int usb_host_get_port(libusb_device *dev, char *port, size_t len) 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]; uint8_t path[7];
size_t off; size_t off;
int rc, i; 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]); off += snprintf(port+off, len-off, ".%d", path[i]);
} }
return off; return off;
#else
return snprintf(port, len, "FIXME");
#endif
} }
static void usb_host_libusb_error(const char *func, int rc) static void usb_host_libusb_error(const char *func, int rc)