retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for libusb-1.0 older than 1.0.9 release. 

git-svn-id: http://voip.null.ro/svn/yate@5983 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2015-06-30 11:27:23 +00:00
parent 7b54c96361
commit f963952940
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -1462,13 +1462,14 @@ if [[ "x$ac_cv_use_libusb" != "xno" ]]; then
SAVE_CFLAGS="$CFLAGS"
LIBS="$LIBS -lusb-1.0"
CFLAGS="$CFLAGS -I$ac_cv_use_libusb/include/libusb-1.0"
AC_TRY_LINK([#include <libusb.h>],[libusb_get_version();],[HAVE_LIBUSB=yes],[HAVE_LIBUSB=no])
LIBS="$SAVE_LIBS"
CFLAGS="$SAVE_CFLAGS"
AC_TRY_LINK([#include <libusb.h>],[libusb_has_capability(0);],[HAVE_LIBUSB=yes],[HAVE_LIBUSB=no])
if [[ "$HAVE_LIBUSB" = "yes" ]]; then
LIBUSB_INC="-I$ac_cv_use_libusb/include/libusb-1.0"
LIBUSB_LIB="-lusb-1.0"
AC_TRY_LINK([#include <libusb.h>],[libusb_get_version();],[LIBUSB_INC="-DHAVE_LIBUSB_VER $LIBUSB_INC"])
fi
LIBS="$SAVE_LIBS"
CFLAGS="$SAVE_CFLAGS"
fi
AC_MSG_RESULT([$HAVE_LIBUSB])
fi

4
modules/radio/ybladerf.cpp
View File

@ -6388,12 +6388,16 @@ BrfModule::BrfModule()
m_ifaceId(0)
{
String tmp;
#ifdef HAVE_LIBUSB_VER
const libusb_version* ver = ::libusb_get_version();
tmp.printf(" using libusb %u.%u.%u.%u",ver->major,ver->minor,ver->micro,ver->nano);
if (!TelEngine::null(ver->rc))
tmp << " rc='" << ver->rc << "'";
if (!TelEngine::null(ver->describe))
tmp << " desc='" << ver->describe << "'";
#else
tmp = " using old libusb 1.0";
#endif
Output("Loaded module BladeRF%s",tmp.safe());
}