RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Input: keep old port status when reconnecting ldd pads

Browse Source 
The port status might not change currently, but it should be more correct this way.
This commit is contained in:
Megamouse 2022-10-12 21:48:13 +02:00
parent 12a83e5a1c
commit cf86b6c107
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Input/pad_thread.cpp
View File

@ -180,7 +180,7 @@ void pad_thread::Init()
if (pad_settings[i].is_ldd_pad) if (pad_settings[i].is_ldd_pad)
{ {
InitLddPad(i); InitLddPad(i, &pad_settings[i].port_status);
} }
else else
{ {
@ -381,19 +381,19 @@ void pad_thread::operator()()
stop_threads(); stop_threads();
} }
void pad_thread::InitLddPad(u32 handle) void pad_thread::InitLddPad(u32 handle, const u32* port_status)
{ {
if (handle >= m_pads.size()) if (handle >= m_pads.size())
{ {
return; return;
} }
static const auto product = input::get_product_info(input::product_type::playstation_3_controller); static const input::product_info product = input::get_product_info(input::product_type::playstation_3_controller);
m_pads[handle]->ldd = true; m_pads[handle]->ldd = true;
m_pads[handle]->Init m_pads[handle]->Init
( (
CELL_PAD_STATUS_CONNECTED | CELL_PAD_STATUS_ASSIGN_CHANGES | CELL_PAD_STATUS_CUSTOM_CONTROLLER, port_status ? *port_status : CELL_PAD_STATUS_CONNECTED | CELL_PAD_STATUS_ASSIGN_CHANGES | CELL_PAD_STATUS_CUSTOM_CONTROLLER,
CELL_PAD_CAPABILITY_PS3_CONFORMITY, CELL_PAD_CAPABILITY_PS3_CONFORMITY,
CELL_PAD_DEV_TYPE_LDD, CELL_PAD_DEV_TYPE_LDD,
0, // CELL_PAD_PCLASS_TYPE_STANDARD 0, // CELL_PAD_PCLASS_TYPE_STANDARD
@ -416,7 +416,7 @@ s32 pad_thread::AddLddPad()
{ {
if (g_cfg_input.player[i]->handler == pad_handler::null && !m_pads[i]->ldd) if (g_cfg_input.player[i]->handler == pad_handler::null && !m_pads[i]->ldd)
{ {
InitLddPad(i); InitLddPad(i, nullptr);
return i; return i;
} }
} }

2
rpcs3/Input/pad_thread.h
View File

@ -39,7 +39,7 @@ public:
protected: protected:
void Init(); void Init();
void InitLddPad(u32 handle); void InitLddPad(u32 handle, const u32* port_status);
// List of all handlers // List of all handlers
std::map<pad_handler, std::shared_ptr<PadHandlerBase>> handlers; std::map<pad_handler, std::shared_ptr<PadHandlerBase>> handlers;