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

DS4: add ZEROPLUS Brook Mars controller

Browse source
This commit is contained in:
Megamouse 2021-03-30 10:58:11 +02:00
parent 7df7ac57cc
commit 877dd1f98d
5 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Input/hid_pad_handler.cpp
View file

@ -13,8 +13,8 @@ static std::mutex s_hid_mutex; // hid_pad_handler is created by pad_thread and p
static u8 s_hid_instances{0};
template <class Device>
hid_pad_handler<Device>::hid_pad_handler(pad_handler type, u16 vid, std::vector<u16> pids)
: PadHandlerBase(type), m_vid(vid), m_pids(std::move(pids))
hid_pad_handler<Device>::hid_pad_handler(pad_handler type, std::vector<id_pair> ids)
: PadHandlerBase(type), m_ids(std::move(ids))
{
std::scoped_lock lock(s_hid_mutex);
ensure(s_hid_instances++ < 255);
@ -100,9 +100,9 @@ void hid_pad_handler<Device>::enumerate_devices()
std::set<std::string> device_paths;
std::map<std::string, std::wstring_view> serials;
for (const auto& pid : m_pids)
for (const auto& [vid, pid] : m_ids)
{
hid_device_info* dev_info = hid_enumerate(m_vid, pid);
hid_device_info* dev_info = hid_enumerate(vid, pid);
hid_device_info* head = dev_info;
while (dev_info)
{