gfgit
/
Heimdall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

heimdall: BridgeManager: libusb_set_debug->libusb_set_option 

The former is deprecated. Fixes compilation warning:

/home/grimler/Heimdall/heimdall/source/BridgeManager.cpp: In member function ‘bool Heimdall::BridgeManager::DetectDevice()’:
/home/grimler/Heimdall/heimdall/source/BridgeManager.cpp:402:57: warning: ‘void libusb_set_debug(libusb_context*, int)’ is deprecated: Use libusb_set_option instead [-Wdeprecated-declarations]
  402 |    libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_NONE);
      |                                                         ^
In file included from /home/grimler/Heimdall/heimdall/source/BridgeManager.cpp:25:
/usr/include/libusb-1.0/libusb.h:1352:18: note: declared here
 1352 | void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
      |                  ^~~~~~~~~~~~~~~~
This commit is contained in:
Henrik Grimler 2021-03-07 19:35:12 +01:00
parent 9bff064d40
commit 094f715c4d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
heimdall/source/BridgeManager.cpp
View File

@ -399,23 +399,23 @@ bool BridgeManager::DetectDevice(void)
switch (usbLogLevel)
{
case UsbLogLevel::None:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_NONE);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
break;
case UsbLogLevel::Error:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_ERROR);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR);
break;
case UsbLogLevel::Warning:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_WARNING);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
break;
case UsbLogLevel::Info:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_INFO);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
break;
case UsbLogLevel::Debug:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_DEBUG);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
break;
}
@ -464,23 +464,23 @@ int BridgeManager::Initialise(bool resume)
switch (usbLogLevel)
{
case UsbLogLevel::None:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_NONE);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
break;
case UsbLogLevel::Error:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_ERROR);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR);
break;
case UsbLogLevel::Warning:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_WARNING);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
break;
case UsbLogLevel::Info:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_INFO);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
break;
case UsbLogLevel::Debug:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_DEBUG);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
break;
}
@ -1244,23 +1244,23 @@ void BridgeManager::SetUsbLogLevel(UsbLogLevel usbLogLevel)
switch (usbLogLevel)
{
case UsbLogLevel::None:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_NONE);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
break;
case UsbLogLevel::Error:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_ERROR);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR);
break;
case UsbLogLevel::Warning:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_WARNING);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
break;
case UsbLogLevel::Info:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_INFO);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
break;
case UsbLogLevel::Debug:
libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_DEBUG);
libusb_set_option(libusbContext, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
break;
}
}