mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-24 14:24:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13491 from JosJuice/oh0-removed-opened

Browse source 
IOS: Remove from m_opened_devices in OH0::OnDeviceChange
This commit is contained in:
Jordan Woyak 2025-04-23 23:25:34 -05:00 • committed by GitHub
commit 3025cd472c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/Core/Core/IOS/USB/OH0/OH0.cpp
View file

@ -81,10 +81,10 @@ void OH0::DoState(PointerWrap& p)
5000);
Core::DisplayMessage("If USB doesn't work properly, an emulation reset may be needed.", 5000);
}
}
p.Do(m_insertion_hooks);
p.Do(m_removal_hooks);
p.Do(m_opened_devices);
}
USBHost::DoState(p);
}
@ -243,9 +243,18 @@ bool OH0::HasDeviceWithVidPid(const u16 vid, const u16 pid) const
void OH0::OnDeviceChange(const ChangeEvent event, std::shared_ptr<USB::Device> device)
{
if (event == ChangeEvent::Inserted)
{
TriggerHook(m_insertion_hooks, {device->GetVid(), device->GetPid()}, IPC_SUCCESS);
}
else if (event == ChangeEvent::Removed)
{
TriggerHook(m_removal_hooks, device->GetId(), IPC_SUCCESS);
// This fixes a problem where Rock Band 3 randomly fails to detect reconnected microphones.
// Real IOS behavior untested.
std::lock_guard lk(m_devices_mutex);
m_opened_devices.erase(device->GetId());
}
}
template <typename T>
@ -286,6 +295,7 @@ std::pair<ReturnCode, u64> OH0::DeviceOpen(const u16 vid, const u16 pid)
void OH0::DeviceClose(const u64 device_id)
{
TriggerHook(m_removal_hooks, device_id, IPC_ENOENT);
std::lock_guard lk(m_devices_mutex);
m_opened_devices.erase(device_id);
}