mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-28 08:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: use static hid singleton for init and exit

Browse Source
This commit is contained in:
Megamouse 2024-09-22 19:50:42 +02:00
parent 31b133b012
commit 18a99a7d8f
2 changed files with 61 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
rpcs3/Input/hid_pad_handler.cpp
View File

@ -17,8 +17,58 @@
LOG_CHANNEL(hid_log, "HID"); LOG_CHANNEL(hid_log, "HID");
static std::mutex s_hid_mutex; // hid_pad_handler is created by pad_thread and pad_settings_dialog struct hid_instance
static u8 s_hid_instances{0}; {
public:
hid_instance() = default;
~hid_instance()
{
std::lock_guard lock(m_hid_mutex);
// Only exit HIDAPI once on exit. HIDAPI uses a global state internally...
if (m_initialized)
{
hid_log.notice("Exiting HIDAPI...");
if (hid_exit() != 0)
{
hid_log.error("hid_exit failed!");
}
}
}
static hid_instance& get_instance()
{
static hid_instance instance {};
return instance;
}
bool initialize()
{
std::lock_guard lock(m_hid_mutex);
// Only init HIDAPI once. HIDAPI uses a global state internally...
if (m_initialized)
{
return true;
}
hid_log.notice("Initializing HIDAPI ...");
if (hid_init() != 0)
{
hid_log.fatal("hid_init error");
return false;
}
m_initialized = true;
return true;
}
private:
bool m_initialized = false;
std::mutex m_hid_mutex;
};
void HidDevice::close() void HidDevice::close()
{ {
@ -33,8 +83,6 @@ template <class Device>
hid_pad_handler<Device>::hid_pad_handler(pad_handler type, std::vector<id_pair> ids) hid_pad_handler<Device>::hid_pad_handler(pad_handler type, std::vector<id_pair> ids)
: PadHandlerBase(type), m_ids(std::move(ids)) : PadHandlerBase(type), m_ids(std::move(ids))
{ {
std::scoped_lock lock(s_hid_mutex);
ensure(s_hid_instances++ < 255);
}; };
template <class Device> template <class Device>
@ -54,17 +102,6 @@ hid_pad_handler<Device>::~hid_pad_handler()
controller.second->close(); controller.second->close();
} }
} }
std::scoped_lock lock(s_hid_mutex);
ensure(s_hid_instances-- > 0);
if (s_hid_instances == 0)
{
// Call hid_exit after all hid_pad_handlers are finished
if (hid_exit() != 0)
{
hid_log.error("hid_exit failed!");
}
}
} }
template <class Device> template <class Device>
@ -73,9 +110,8 @@ bool hid_pad_handler<Device>::Init()
if (m_is_init) if (m_is_init)
return true; return true;
const int res = hid_init(); if (!hid_instance::get_instance().initialize())
if (res != 0) return false;
fmt::throw_exception("%s hidapi-init error.threadproc", m_type);
#if defined(__APPLE__) #if defined(__APPLE__)
hid_darwin_set_open_exclusive(0); hid_darwin_set_open_exclusive(0);

9
rpcs3/Input/sdl_pad_handler.cpp
View File

@ -23,6 +23,12 @@ public:
} }
} }
static sdl_instance& get_instance()
{
static sdl_instance instance {};
return instance;
}
bool initialize() bool initialize()
{ {
// Only init SDL once. SDL uses a global state internally... // Only init SDL once. SDL uses a global state internally...
@ -256,8 +262,7 @@ bool sdl_pad_handler::Init()
if (m_is_init) if (m_is_init)
return true; return true;
static sdl_instance s_sdl_instance {}; if (!sdl_instance::get_instance().initialize())
if (!s_sdl_instance.initialize())
return false; return false;
if (g_cfg.io.load_sdl_mappings) if (g_cfg.io.load_sdl_mappings)