mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-14 10:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellPad: Send disconnection notification when swapping device class

Browse Source
This commit is contained in:
Sanjay Govind 2025-01-22 21:38:36 +13:00 committed by Megamouse
parent e83eeb3cca
commit fd66b6b103
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/Io/pad_types.h
View File

@ -504,6 +504,8 @@ struct Pad
u16 m_vendor_id{0};
u16 m_product_id{0};
u64 m_disconnection_timer{0};
s32 m_pressure_intensity_button_index{-1}; // Special button index. -1 if not set.
bool m_pressure_intensity_button_pressed{}; // Last sensitivity button press state, used for toggle.
bool m_pressure_intensity_toggled{}; // Whether the sensitivity is toggled on or off.

34
rpcs3/Input/pad_thread.cpp
View File

@ -56,6 +56,9 @@ struct pad_setting
u32 port_status = 0;
u32 device_capability = 0;
u32 device_type = 0;
u32 class_type = 0;
u16 vendor_id = 0;
u16 product_id = 0;
bool is_ldd_pad = false;
};
@ -86,6 +89,9 @@ void pad_thread::Init()
m_pads[i]->m_port_status,
m_pads[i]->m_device_capability,
m_pads[i]->m_device_type,
m_pads[i]->m_class_type,
m_pads[i]->m_vendor_id,
m_pads[i]->m_product_id,
m_pads[i]->ldd
};
}
@ -96,6 +102,9 @@ void pad_thread::Init()
CELL_PAD_STATUS_DISCONNECTED,
CELL_PAD_CAPABILITY_PS3_CONFORMITY | CELL_PAD_CAPABILITY_PRESS_MODE | CELL_PAD_CAPABILITY_ACTUATOR,
CELL_PAD_DEV_TYPE_STANDARD,
CELL_PAD_PCLASS_TYPE_STANDARD,
0,
0,
false
};
}
@ -197,6 +206,12 @@ void pad_thread::Init()
{
input_log.notice("Pad %d: config=\n%s", i, cfg->to_string());
}
// If the user changes the emulated controller, then simulate unplugging and plugging in a new controller
if (m_pads_connected[i] && (pad_settings[i].class_type != pad->m_class_type || pad_settings[i].vendor_id != pad->m_vendor_id || pad_settings[i].product_id != pad->m_product_id))
{
pad->m_disconnection_timer = get_system_time() + 30'000ull;
}
}
pad->is_fake_pad = ((g_cfg.io.move == move_handler::real || g_cfg.io.move == move_handler::fake) && i >= (static_cast<u32>(CELL_PAD_MAX_PORT_NUM) - static_cast<u32>(CELL_GEM_MAX_NUM)))
@ -235,6 +250,25 @@ void pad_thread::update_pad_states()
for (usz i = 0; i < m_pads.size(); i++)
{
const auto& pad = m_pads[i];
// Simulate unplugging and plugging in a new controller
if (pad && pad->m_disconnection_timer > 0)
{
const bool is_connected = pad->m_port_status & CELL_PAD_STATUS_CONNECTED;
const u64 now = get_system_time();
if (is_connected && now < pad->m_disconnection_timer)
{
pad->m_port_status &= ~CELL_PAD_STATUS_CONNECTED;
pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
}
else if (!is_connected && now >= pad->m_disconnection_timer)
{
pad->m_port_status |= CELL_PAD_STATUS_CONNECTED + CELL_PAD_STATUS_ASSIGN_CHANGES;
pad->m_disconnection_timer = 0;
}
}
const bool connected = pad && !pad->is_fake_pad && !!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED);
if (m_pads_connected[i] == connected)