RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update submodules

Browse source 
- Updates SDL to 2.30.0
- Updates curl to 8.6.0
- Updates libusb to 1.0.27
- Updates zlib to 1.3.1
- Updates FAudio to 24.02
This commit is contained in:
Megamouse 2024-01-31 00:40:06 +01:00
parent 40c51a1f05
commit 85f4c38b4e
8 changed files with 90 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
rpcs3/Emu/Cell/lv2/sys_usbd.cpp
View file

@ -158,43 +158,57 @@ void LIBUSB_CALL callback_transfer(struct libusb_transfer* transfer)
usbh.transfer_complete(transfer);
}
static void LIBUSB_CALL log_cb(libusb_context *ctx, enum libusb_log_level level, const char *str)
{
if (!str)
return;
const std::string msg = fmt::trim(str, " \t\n");
switch (level)
{
case LIBUSB_LOG_LEVEL_ERROR:
sys_usbd.error("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_WARNING:
sys_usbd.warning("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_INFO:
sys_usbd.notice("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_DEBUG:
sys_usbd.trace("libusb log: %s", msg);
break;
default:
break;
}
}
usb_handler_thread::usb_handler_thread()
{
#if LIBUSB_API_VERSION >= 0x0100010A
libusb_init_option log_lv_opt{};
log_lv_opt.option = LIBUSB_OPTION_LOG_LEVEL;
log_lv_opt.value.ival = LIBUSB_LOG_LEVEL_WARNING;// You can also set the LIBUSB_DEBUG env variable instead
libusb_init_option log_cb_opt{};
log_cb_opt.option = LIBUSB_OPTION_LOG_CB;
log_cb_opt.value.log_cbval = &log_cb;
std::vector<libusb_init_option> options = {
std::move(log_lv_opt),
std::move(log_cb_opt)
};
if (int res = libusb_init_context(&ctx, options.data(), static_cast<int>(options.size())); res < 0)
#else
if (int res = libusb_init(&ctx); res < 0)
#endif
{
sys_usbd.error("Failed to initialize sys_usbd: %s", libusb_error_name(res));
return;
}
#if LIBUSB_API_VERSION >= 0x01000107
// Set LIBUSB_DEBUG env variable to receive log messages
libusb_set_log_cb(ctx, [](libusb_context* /* ctx */, libusb_log_level level, const char* str)
{
if (!str)
return;
const std::string msg = fmt::trim(str, " \t\n");
switch (level)
{
case LIBUSB_LOG_LEVEL_ERROR:
sys_usbd.error("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_WARNING:
sys_usbd.warning("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_INFO:
sys_usbd.notice("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_DEBUG:
sys_usbd.trace("libusb log: %s", msg);
break;
default:
break;
}
}, LIBUSB_LOG_CB_CONTEXT);
#endif
for (u32 index = 0; index < MAX_SYS_USBD_TRANSFERS; index++)
{
transfers[index].transfer = libusb_alloc_transfer(8);