mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-15 14:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: allow running pad thread without emulation

Browse Source
This commit is contained in:
Megamouse 2024-07-06 17:44:47 +02:00
parent 0db7ab64ee
commit 1a61a7a39f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rpcs3/Emu/Cell/lv2/sys_usbd.cpp
View File

@ -835,10 +835,15 @@ void usb_handler_thread::disconnect_usb_device(std::shared_ptr<usb_device> dev,
void connect_usb_controller(u8 index, input::product_type type)
{
bool already_connected = false;
auto& usbh = g_fxo->get<named_thread<usb_handler_thread>>();
auto usbh = g_fxo->try_get<named_thread<usb_handler_thread>>();
if (!usbh)
{
return;
}
if (const auto it = usbh.pad_to_usb.find(index); it != usbh.pad_to_usb.end())
bool already_connected = false;
if (const auto it = usbh->pad_to_usb.find(index); it != usbh->pad_to_usb.end())
{
if (it->second.first == type)
{
@ -846,8 +851,8 @@ void connect_usb_controller(u8 index, input::product_type type)
}
else
{
usbh.disconnect_usb_device(it->second.second, true);
usbh.pad_to_usb.erase(it->first);
usbh->disconnect_usb_device(it->second.second, true);
usbh->pad_to_usb.erase(it->first);
}
}
@ -859,9 +864,9 @@ void connect_usb_controller(u8 index, input::product_type type)
}
sys_usbd.success("Adding emulated GunCon3 (controller %d)", index);
std::shared_ptr<usb_device> dev = std::make_shared<usb_device_guncon3>(index, usbh.get_new_location());
usbh.connect_usb_device(dev, true);
usbh.pad_to_usb.emplace(index, std::pair(type, dev));
std::shared_ptr<usb_device> dev = std::make_shared<usb_device_guncon3>(index, usbh->get_new_location());
usbh->connect_usb_device(dev, true);
usbh->pad_to_usb.emplace(index, std::pair(type, dev));
}
}

5
rpcs3/Input/pad_thread.cpp
View File

@ -363,7 +363,10 @@ void pad_thread::operator()()
}
}
update_pad_states();
if (Emu.IsRunning())
{
update_pad_states();
}
m_info.now_connect = connected_devices + num_ldd_pad;