archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 15:31:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add exception for sys_usbd_initialize

Browse source
This commit is contained in:
Eladash 2019-09-29 09:25:52 +03:00 • committed by Ani
parent a1e7cdf1e9
commit 79a3a7ce4c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -233,9 +233,7 @@ void usb_handler_thread::operator()()
// Process fake transfers // Process fake transfers
if (!fake_transfers.empty()) if (!fake_transfers.empty())
{ {
const auto usbh = g_fxo->get<named_thread<usb_handler_thread>>(); std::lock_guard lock(this->mutex);
std::lock_guard lock(usbh->mutex);
u64 timestamp = get_system_time() - Emu.GetPauseTime(); u64 timestamp = get_system_time() - Emu.GetPauseTime();
@ -442,7 +440,9 @@ s32 sys_usbd_initialize(vm::ptr<u32> handle)
std::lock_guard lock(usbh->mutex); std::lock_guard lock(usbh->mutex);
usbh->is_init = true; // Must not occur (lv2 allows multiple handles, cellUsbd does not)
verify("sys_usbd Initialized twice" HERE), !usbh->is_init.exchange(true);
*handle = 0x115B; *handle = 0x115B;
// TODO // TODO