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

input: implement basic copiloting
Some checks failed
Generate Translation Template / Generate Translation Template (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 gcc (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm clang (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Linux ubuntu-24.04 clang (push) Has been cancelled
Details
Build RPCS3 / RPCS3 Windows (push) Has been cancelled
Details

Browse source
This commit is contained in:
Megamouse 2025-05-25 22:42:53 +02:00
parent ae35430c96
commit 382e62c7d8
18 changed files with 212 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/Cell/Modules/cellGem.cpp
View file

@ -351,7 +351,7 @@ public:
for (u32 i = 0; i < CELL_GEM_MAX_NUM; i++)
{
const auto& pad = ::at32(handler->GetPads(), pad_num(i));
const bool connected = pad && (pad->m_port_status & CELL_PAD_STATUS_CONNECTED) && i < attribute.max_connect;
const bool connected = pad && pad->is_connected() && i < attribute.max_connect;
const bool is_real_move = g_cfg.io.move != move_handler::real || pad->m_pad_handler == pad_handler::move;
update_connection(i, connected && is_real_move);
@ -469,7 +469,7 @@ public:
for (u32 i = 0; i < std::min<u32>(attribute.max_connect, CELL_GEM_MAX_NUM); i++)
{
const auto& pad = ::at32(handler->GetPads(), pad_num(i));
if (pad && pad->m_pad_handler == pad_handler::move && (pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad && pad->m_pad_handler == pad_handler::move && pad->is_connected())
{
connected_controllers++;
@ -490,7 +490,7 @@ public:
for (u32 i = 0; i < std::min<u32>(attribute.max_connect, CELL_GEM_MAX_NUM); i++)
{
const auto& pad = ::at32(handler->GetPads(), pad_num(i));
if (pad && (pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad && pad->is_connected())
{
connected_controllers++;
@ -1776,7 +1776,7 @@ static void ds3_input_to_pad(const u32 gem_num, be_t<u16>& digital_buttons, be_t
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
{
return;
}
@ -1864,7 +1864,7 @@ static void ds3_pos_to_gem_state(u32 gem_num, gem_config::gem_controller& contro
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
{
return;
}
@ -1895,7 +1895,7 @@ static void ps_move_pos_to_gem_state(u32 gem_num, gem_config::gem_controller& co
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
if (pad->m_pad_handler != pad_handler::move || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->m_pad_handler != pad_handler::move || !pad->is_connected())
{
return;
}
@ -1940,7 +1940,7 @@ static void ds3_input_to_ext(u32 gem_num, gem_config::gem_controller& controller
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
{
return;
}
@ -2777,7 +2777,7 @@ error_code cellGemGetInertialState(u32 gem_num, u32 state_flag, u64 timestamp, v
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
if (pad && (pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad && pad->is_connected())
{
inertial_state->temperature = pad->move_data.temperature;
inertial_state->accelerometer[0] = pad->move_data.accelerometer_x;
@ -3392,7 +3392,7 @@ error_code cellGemReadExternalPortDeviceInfo(u32 gem_num, vm::ptr<u32> ext_id, v
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
if (pad->m_pad_handler != pad_handler::move || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->m_pad_handler != pad_handler::move || !pad->is_connected())
{
return CELL_GEM_NOT_CONNECTED;
}
@ -3706,7 +3706,7 @@ error_code cellGemWriteExternalPort(u32 gem_num, vm::ptr<u8[CELL_GEM_EXTERNAL_PO
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), pad_num(gem_num));
if (pad->m_pad_handler != pad_handler::move || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->m_pad_handler != pad_handler::move || !pad->is_connected())
{
return CELL_GEM_NOT_CONNECTED;
}

147
rpcs3/Emu/Cell/Modules/cellPad.cpp
View file

@ -272,7 +272,7 @@ error_code cellPadInit(ppu_thread& ppu, u32 max_connect)
for (usz i = 0; i < config.get_max_connect(); ++i)
{
if (!pads[i]->is_fake_pad && (pads[i]->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pads[i]->is_fake_pad && pads[i]->is_connected())
{
send_sys_io_connect_event(i, CELL_PAD_STATUS_CONNECTED);
}
@ -339,7 +339,7 @@ error_code cellPadClearBuf(u32 port_no)
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
clear_pad_buffer(pad);
@ -411,26 +411,59 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
}
};
for (Button& button : pad->m_buttons)
for (const Button& button : pad->m_buttons)
{
// here we check btns, and set pad accordingly,
// if something changed, set btnChanged
bool pressed = button.m_pressed;
u16 value = button.m_value;
// Merge copilots
if (!pad->copilots.empty())
{
for (const auto& copilot : pad->copilots)
{
if (!copilot || !copilot->is_connected())
{
continue;
}
for (const Button& other : copilot->m_buttons)
{
if (button.m_offset == other.m_offset && button.m_outKeyCode == other.m_outKeyCode)
{
if (other.m_pressed)
{
pressed = true;
if (value < other.m_value)
{
value = other.m_value;
}
}
break;
}
}
}
}
switch (button.m_offset)
{
case CELL_PAD_BTN_OFFSET_DIGITAL1:
{
if (button.m_pressed)
if (pressed)
pad->m_digital_1 |= button.m_outKeyCode;
else
pad->m_digital_1 &= ~button.m_outKeyCode;
switch (button.m_outKeyCode)
{
case CELL_PAD_CTRL_LEFT: set_value(pad->m_press_left, button.m_value); break;
case CELL_PAD_CTRL_DOWN: set_value(pad->m_press_down, button.m_value); break;
case CELL_PAD_CTRL_RIGHT: set_value(pad->m_press_right, button.m_value); break;
case CELL_PAD_CTRL_UP: set_value(pad->m_press_up, button.m_value); break;
case CELL_PAD_CTRL_LEFT: set_value(pad->m_press_left, value); break;
case CELL_PAD_CTRL_DOWN: set_value(pad->m_press_down, value); break;
case CELL_PAD_CTRL_RIGHT: set_value(pad->m_press_right, value); break;
case CELL_PAD_CTRL_UP: set_value(pad->m_press_up, value); break;
// These arent pressure btns
case CELL_PAD_CTRL_R3:
case CELL_PAD_CTRL_L3:
@ -442,21 +475,21 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
}
case CELL_PAD_BTN_OFFSET_DIGITAL2:
{
if (button.m_pressed)
if (pressed)
pad->m_digital_2 |= button.m_outKeyCode;
else
pad->m_digital_2 &= ~button.m_outKeyCode;
switch (button.m_outKeyCode)
{
case CELL_PAD_CTRL_SQUARE: set_value(pad->m_press_square, button.m_value); break;
case CELL_PAD_CTRL_CROSS: set_value(pad->m_press_cross, button.m_value); break;
case CELL_PAD_CTRL_CIRCLE: set_value(pad->m_press_circle, button.m_value); break;
case CELL_PAD_CTRL_TRIANGLE: set_value(pad->m_press_triangle, button.m_value); break;
case CELL_PAD_CTRL_R1: set_value(pad->m_press_R1, button.m_value); break;
case CELL_PAD_CTRL_L1: set_value(pad->m_press_L1, button.m_value); break;
case CELL_PAD_CTRL_R2: set_value(pad->m_press_R2, button.m_value); break;
case CELL_PAD_CTRL_L2: set_value(pad->m_press_L2, button.m_value); break;
case CELL_PAD_CTRL_SQUARE: set_value(pad->m_press_square, value); break;
case CELL_PAD_CTRL_CROSS: set_value(pad->m_press_cross, value); break;
case CELL_PAD_CTRL_CIRCLE: set_value(pad->m_press_circle, value); break;
case CELL_PAD_CTRL_TRIANGLE: set_value(pad->m_press_triangle, value); break;
case CELL_PAD_CTRL_R1: set_value(pad->m_press_R1, value); break;
case CELL_PAD_CTRL_L1: set_value(pad->m_press_L1, value); break;
case CELL_PAD_CTRL_R2: set_value(pad->m_press_R2, value); break;
case CELL_PAD_CTRL_L2: set_value(pad->m_press_L2, value); break;
default: break;
}
break;
@ -465,18 +498,18 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
{
switch (button.m_outKeyCode)
{
case CELL_PAD_CTRL_PRESS_RIGHT: set_value(pad->m_press_right, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_LEFT: set_value(pad->m_press_left, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_UP: set_value(pad->m_press_up, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_DOWN: set_value(pad->m_press_down, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_TRIANGLE: set_value(pad->m_press_triangle, button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_CIRCLE: set_value(pad->m_press_circle, button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_CROSS: set_value(pad->m_press_cross, button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_SQUARE: set_value(pad->m_press_square, button.m_value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_L1: set_value(pad->m_press_L1, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_R1: set_value(pad->m_press_R1, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_L2: set_value(pad->m_press_L2, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_R2: set_value(pad->m_press_R2, button.m_value, true); break;
case CELL_PAD_CTRL_PRESS_RIGHT: set_value(pad->m_press_right, value, true); break;
case CELL_PAD_CTRL_PRESS_LEFT: set_value(pad->m_press_left, value, true); break;
case CELL_PAD_CTRL_PRESS_UP: set_value(pad->m_press_up, value, true); break;
case CELL_PAD_CTRL_PRESS_DOWN: set_value(pad->m_press_down, value, true); break;
case CELL_PAD_CTRL_PRESS_TRIANGLE: set_value(pad->m_press_triangle, value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_CIRCLE: set_value(pad->m_press_circle, value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_CROSS: set_value(pad->m_press_cross, value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_SQUARE: set_value(pad->m_press_square, value, true, 255, 63); break; // Infrared on RIDE Skateboard
case CELL_PAD_CTRL_PRESS_L1: set_value(pad->m_press_L1, value, true); break;
case CELL_PAD_CTRL_PRESS_R1: set_value(pad->m_press_R1, value, true); break;
case CELL_PAD_CTRL_PRESS_L2: set_value(pad->m_press_L2, value, true); break;
case CELL_PAD_CTRL_PRESS_R2: set_value(pad->m_press_R2, value, true); break;
default: break;
}
break;
@ -488,12 +521,44 @@ void pad_get_data(u32 port_no, CellPadData* data, bool get_periph_data = false)
for (const AnalogStick& stick : pad->m_sticks)
{
u16 value = stick.m_value;
// Merge copilots
if (!pad->copilots.empty())
{
const auto normalize = [](s32 value)
{
return (value - 128) / 127.0f;
};
f32 accumulated_value = normalize(value);
for (const auto& copilot : pad->copilots)
{
if (!copilot || !copilot->is_connected())
{
continue;
}
for (const AnalogStick& other : copilot->m_sticks)
{
if (stick.m_offset == other.m_offset)
{
accumulated_value += normalize(other.m_value);
break;
}
}
}
value = static_cast<u16>(std::round(std::clamp(accumulated_value * 127.0f + 128.0f, 0.0f, 255.0f)));
}
switch (stick.m_offset)
{
case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X: set_value(pad->m_analog_left_x, stick.m_value); break;
case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y: set_value(pad->m_analog_left_y, stick.m_value); break;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X: set_value(pad->m_analog_right_x, stick.m_value); break;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y: set_value(pad->m_analog_right_y, stick.m_value); break;
case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X: set_value(pad->m_analog_left_x, value); break;
case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y: set_value(pad->m_analog_left_y, value); break;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X: set_value(pad->m_analog_right_x, value); break;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y: set_value(pad->m_analog_right_y, value); break;
default: break;
}
}
@ -712,7 +777,7 @@ error_code cellPadGetData(u32 port_no, vm::ptr<CellPadData> data)
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
pad_get_data(port_no, data.get_ptr());
@ -798,7 +863,7 @@ error_code cellPadPeriphGetData(u32 port_no, vm::ptr<CellPadPeriphData> data)
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
pad_get_data(port_no, &data->cellpad_data, true);
@ -830,7 +895,7 @@ error_code cellPadGetRawData(u32 port_no, vm::ptr<CellPadData> data)
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
// ?
@ -843,7 +908,7 @@ error_code cellPadGetDataExtra(u32 port_no, vm::ptr<u32> device_type, vm::ptr<Ce
cellPad.trace("cellPadGetDataExtra(port_no=%d, device_type=*0x%x, data=*0x%x)", port_no, device_type, data);
// TODO: This is used just to get data from a BD/CEC remote,
// but if the port isnt a remote, device type is set to CELL_PAD_DEV_TYPE_STANDARD and just regular cellPadGetData is returned
// but if the port isn't a remote, device type is set to CELL_PAD_DEV_TYPE_STANDARD and just regular cellPadGetData is returned
if (auto err = cellPadGetData(port_no, data))
{
@ -894,7 +959,7 @@ error_code cellPadSetActDirect(u32 port_no, vm::ptr<CellPadActParam> param)
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
// TODO: find out if this is checked here or later or at all
@ -1021,7 +1086,7 @@ error_code cellPadGetCapabilityInfo(u32 port_no, vm::ptr<CellPadCapabilityInfo>
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
// Should return the same as device capability mask, psl1ght has it backwards in pad->h
@ -1077,7 +1142,7 @@ error_code cellPadInfoPressMode(u32 port_no)
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
return not_an_error((pad->m_device_capability & CELL_PAD_CAPABILITY_PRESS_MODE) ? 1 : 0);
@ -1104,7 +1169,7 @@ error_code cellPadInfoSensorMode(u32 port_no)
const auto& pads = handler->GetPads();
const auto& pad = pads[port_no];
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (pad->is_fake_pad || !config.is_reportedly_connected(port_no) || !pad->is_connected())
return not_an_error(CELL_PAD_ERROR_NO_DEVICE);
return not_an_error((pad->m_device_capability & CELL_PAD_CAPABILITY_SENSOR_MODE) ? 1 : 0);

14
rpcs3/Emu/Cell/Modules/cellPad.h
View file

@ -42,13 +42,13 @@ enum
struct pad_data_internal
{
u16 vendor_id;
u16 product_id;
u32 port_status;
u32 device_capability;
u32 device_type;
u32 pclass_type;
u32 pclass_profile;
u16 vendor_id = 0;
u16 product_id = 0;
u32 port_status = 0;
u32 device_capability = 0;
u32 device_type = 0;
u32 pclass_type = 0;
u32 pclass_profile = 0;
ENABLE_BITWISE_SERIALIZATION;
};

2
rpcs3/Emu/Io/Buzz.cpp
View file

@ -173,7 +173,7 @@ void usb_device_buzz::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/
{
const auto& pad = pads[i];
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
{
continue;
}

2
rpcs3/Emu/Io/GHLtar.cpp
View file

@ -152,7 +152,7 @@ void usb_device_ghltar::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint
const auto handler = pad::get_pad_thread();
const auto& pad = ::at32(handler->GetPads(), m_controller_index);
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
{
return;
}

2
rpcs3/Emu/Io/GameTablet.cpp
View file

@ -198,7 +198,7 @@ void usb_device_gametablet::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endp
const auto gamepad_handler = pad::get_pad_thread();
const auto& pads = gamepad_handler->GetPads();
const auto& pad = ::at32(pads, m_controller_index);
if (pad->m_port_status & CELL_PAD_STATUS_CONNECTED)
if (pad->is_connected())
{
for (Button& button : pad->m_buttons)
{

2
rpcs3/Emu/Io/GunCon3.cpp
View file

@ -258,7 +258,7 @@ void usb_device_guncon3::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint,
const auto gamepad_handler = pad::get_pad_thread();
const auto& pads = gamepad_handler->GetPads();
const auto& pad = ::at32(pads, m_controller_index);
if (pad->m_port_status & CELL_PAD_STATUS_CONNECTED)
if (pad->is_connected())
{
cfg->handle_input(pad, true, input_callback);
}

2
rpcs3/Emu/Io/TopShotElite.cpp
View file

@ -318,7 +318,7 @@ void usb_device_topshotelite::interrupt_transfer(u32 buf_size, u8* buf, u32 /*en
const auto gamepad_handler = pad::get_pad_thread();
const auto& pads = gamepad_handler->GetPads();
const auto& pad = ::at32(pads, m_controller_index);
if (pad->m_port_status & CELL_PAD_STATUS_CONNECTED)
if (pad->is_connected())
{
cfg->handle_input(pad, true, input_callback);
}

2
rpcs3/Emu/Io/TopShotFearmaster.cpp
View file

@ -342,7 +342,7 @@ void usb_device_topshotfearmaster::interrupt_transfer(u32 buf_size, u8* buf, u32
const auto gamepad_handler = pad::get_pad_thread();
const auto& pads = gamepad_handler->GetPads();
const auto& pad = ::at32(pads, m_controller_index);
if (pad->m_port_status & CELL_PAD_STATUS_CONNECTED)
if (pad->is_connected())
{
cfg->handle_input(pad, true, input_callback);
}

2
rpcs3/Emu/Io/Turntable.cpp
View file

@ -166,7 +166,7 @@ void usb_device_turntable::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpo
const auto& pads = handler->GetPads();
const auto& pad = ::at32(pads, m_controller_index);
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
return;
const auto& cfg = ::at32(g_cfg_turntable.players, m_controller_index);

24
rpcs3/Emu/Io/pad_types.h
View file

@ -151,6 +151,13 @@ enum
CELL_PAD_FAKE_TYPE_TOP_SHOT_ELITE = 0xa001,
CELL_PAD_FAKE_TYPE_TOP_SHOT_FEARMASTER = 0xa002,
CELL_PAD_FAKE_TYPE_GAMETABLET = 0xa003,
CELL_PAD_FAKE_TYPE_COPILOT_1 = 0xa004,
CELL_PAD_FAKE_TYPE_COPILOT_2 = 0xa005,
CELL_PAD_FAKE_TYPE_COPILOT_3 = 0xa006,
CELL_PAD_FAKE_TYPE_COPILOT_4 = 0xa007,
CELL_PAD_FAKE_TYPE_COPILOT_5 = 0xa008,
CELL_PAD_FAKE_TYPE_COPILOT_6 = 0xa009,
CELL_PAD_FAKE_TYPE_COPILOT_7 = 0xa00a,
CELL_PAD_FAKE_TYPE_LAST,
CELL_PAD_PCLASS_TYPE_MAX // last item
@ -536,6 +543,8 @@ struct Pad
std::array<AnalogSensor, 4> m_sensors{};
std::array<VibrateMotor, 2> m_vibrateMotors{};
std::vector<std::shared_ptr<Pad>> copilots;
// These hold bits for their respective buttons
u16 m_digital_1{0};
u16 m_digital_2{0};
@ -592,4 +601,19 @@ struct Pad
m_product_id = product_id;
m_pressure_intensity = (255 * pressure_intensity_percent) / 100;
}
u32 copilot_player() const
{
if (m_class_type >= CELL_PAD_FAKE_TYPE_COPILOT_1 && m_class_type <= CELL_PAD_FAKE_TYPE_COPILOT_7)
{
return m_class_type - CELL_PAD_FAKE_TYPE_COPILOT_1;
}
return umax;
}
bool is_connected() const
{
return !!(m_port_status & CELL_PAD_STATUS_CONNECTED);
}
};

4
rpcs3/Emu/Io/usio.cpp
View file

@ -210,7 +210,7 @@ void usb_device_usio::translate_input_taiko()
const usz offset = player * 8ULL;
auto& status = m_io_status[0];
if (const auto& pad = ::at32(handler->GetPads(), pad_number); (pad->m_port_status & CELL_PAD_STATUS_CONNECTED) && is_input_allowed())
if (const auto& pad = ::at32(handler->GetPads(), pad_number); pad->is_connected() && is_input_allowed())
{
const auto& cfg = ::at32(g_cfg_usio.players, pad_number);
cfg->handle_input(pad, false, [&](usio_btn btn, pad_button /*pad_btn*/, u16 /*value*/, bool pressed, bool& /*abort*/)
@ -295,7 +295,7 @@ void usb_device_usio::translate_input_tekken()
auto& status = m_io_status[player / 2];
auto& input = digital_input[player / 2];
if (const auto& pad = ::at32(handler->GetPads(), pad_number); (pad->m_port_status & CELL_PAD_STATUS_CONNECTED) && is_input_allowed())
if (const auto& pad = ::at32(handler->GetPads(), pad_number); pad->is_connected() && is_input_allowed())
{
const auto& cfg = ::at32(g_cfg_usio.players, pad_number);
cfg->handle_input(pad, false, [&](usio_btn btn, pad_button /*pad_btn*/, u16 /*value*/, bool pressed, bool& /*abort*/)

2
rpcs3/Emu/RSX/Overlays/overlays.cpp
View file

@ -225,7 +225,7 @@ namespace rsx
continue;
}
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
{
continue;
}

2
rpcs3/Input/gui_pad_thread.cpp
View file

@ -283,7 +283,7 @@ void gui_pad_thread::run()
void gui_pad_thread::process_input()
{
if (!m_pad || !(m_pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!m_pad || !m_pad->is_connected())
{
return;
}

53
rpcs3/Input/pad_thread.cpp
View file

@ -227,18 +227,47 @@ void pad_thread::Init()
connect_usb_controller(i, input::get_product_by_vid_pid(pad->m_vendor_id, pad->m_product_id));
}
// Set copilots
for (usz i = 0; i < m_pads.size(); i++)
{
if (!m_pads[i]) continue;
m_pads[i]->copilots.clear();
for (usz j = 0; j < m_pads.size(); j++)
{
if (i == j || !m_pads[j] || m_pads[j]->copilot_player() != i)
continue;
m_pads[i]->copilots.push_back(m_pads[j]);
}
}
// Initialize active mouse and keyboard. Activate pad handler if one exists.
input::set_mouse_and_keyboard(m_handlers.contains(pad_handler::keyboard) ? input::active_mouse_and_keyboard::pad : input::active_mouse_and_keyboard::emulated);
}
void pad_thread::SetRumble(const u32 pad, u8 large_motor, bool small_motor)
void pad_thread::SetRumble(u32 pad, u8 large_motor, bool small_motor)
{
if (pad >= m_pads.size())
if (pad >= m_pads.size() || !m_pads[pad])
return;
m_pads[pad]->m_last_rumble_time_us = get_system_time();
const u64 now_us = get_system_time();
m_pads[pad]->m_last_rumble_time_us = now_us;
m_pads[pad]->m_vibrateMotors[0].m_value = large_motor;
m_pads[pad]->m_vibrateMotors[1].m_value = small_motor ? 255 : 0;
// Rumble copilots as well
for (const auto& copilot : m_pads[pad]->copilots)
{
if (copilot && copilot->is_connected())
{
copilot->m_last_rumble_time_us = now_us;
copilot->m_vibrateMotors[0].m_value = large_motor;
copilot->m_vibrateMotors[1].m_value = small_motor ? 255 : 0;
}
}
}
void pad_thread::SetIntercepted(bool intercepted)
@ -263,7 +292,7 @@ void pad_thread::update_pad_states()
// 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 bool is_connected = pad->is_connected();
const u64 now = get_system_time();
if (is_connected && now < pad->m_disconnection_timer)
@ -278,7 +307,7 @@ void pad_thread::update_pad_states()
}
}
const bool connected = pad && !pad->is_fake_pad && !!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED);
const bool connected = pad && !pad->is_fake_pad && pad->is_connected();
if (m_pads_connected[i] == connected)
continue;
@ -431,7 +460,7 @@ void pad_thread::operator()()
{
const auto& pad = m_pads[i];
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
continue;
for (const auto& button : pad->m_buttons)
@ -468,7 +497,7 @@ void pad_thread::operator()()
const auto& pad = m_pads[i];
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
continue;
// Check if an LDD pad pressed the PS button (bit 0 of the first button)
@ -535,7 +564,7 @@ void pad_thread::operator()()
{
const auto& pad = m_pads[i];
if (!(pad->m_port_status & CELL_PAD_STATUS_CONNECTED))
if (!pad->is_connected())
continue;
for (const auto& button : pad->m_buttons)
@ -640,11 +669,11 @@ s32 pad_thread::AddLddPad()
void pad_thread::UnregisterLddPad(u32 handle)
{
ensure(handle < m_pads.size());
auto& pad = ::at32(m_pads, handle);
m_pads[handle]->ldd = false;
m_pads[handle]->m_port_status &= ~CELL_PAD_STATUS_CONNECTED;
m_pads[handle]->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
pad->ldd = false;
pad->m_port_status &= ~CELL_PAD_STATUS_CONNECTED;
pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
num_ldd_pad--;
}

2
rpcs3/Input/pad_thread.h
View file

@ -26,7 +26,7 @@ public:
PadInfo& GetInfo() { return m_info; }
std::array<std::shared_ptr<Pad>, CELL_PAD_MAX_PORT_NUM>& GetPads() { return m_pads; }
void SetRumble(const u32 pad, u8 large_motor, bool small_motor);
void SetRumble(u32 pad, u8 large_motor, bool small_motor);
void SetIntercepted(bool intercepted);
s32 AddLddPad();

5
rpcs3/Input/product_info.cpp
View file

@ -261,6 +261,11 @@ namespace input
std::vector<product_info> get_products_by_class(int class_id)
{
if (class_id >= CELL_PAD_FAKE_TYPE_COPILOT_1 && class_id <= CELL_PAD_FAKE_TYPE_COPILOT_7)
{
class_id = CELL_PAD_PCLASS_TYPE_STANDARD;
}
std::vector<product_info> ret;
for (const auto& [type, product] : input_products)
{

7
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -183,6 +183,13 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_setti
ui->chooseClass->addItem(tr("Top Shot Elite"), u32{CELL_PAD_FAKE_TYPE_TOP_SHOT_ELITE});
ui->chooseClass->addItem(tr("Top Shot Fearmaster"),u32{CELL_PAD_FAKE_TYPE_TOP_SHOT_FEARMASTER});
ui->chooseClass->addItem(tr("uDraw GameTablet"), u32{CELL_PAD_FAKE_TYPE_GAMETABLET});
ui->chooseClass->addItem(tr("Copilot for Player 1"), u32{CELL_PAD_FAKE_TYPE_COPILOT_1});
ui->chooseClass->addItem(tr("Copilot for Player 2"), u32{CELL_PAD_FAKE_TYPE_COPILOT_2});
ui->chooseClass->addItem(tr("Copilot for Player 3"), u32{CELL_PAD_FAKE_TYPE_COPILOT_3});
ui->chooseClass->addItem(tr("Copilot for Player 4"), u32{CELL_PAD_FAKE_TYPE_COPILOT_4});
ui->chooseClass->addItem(tr("Copilot for Player 5"), u32{CELL_PAD_FAKE_TYPE_COPILOT_5});
ui->chooseClass->addItem(tr("Copilot for Player 6"), u32{CELL_PAD_FAKE_TYPE_COPILOT_6});
ui->chooseClass->addItem(tr("Copilot for Player 7"), u32{CELL_PAD_FAKE_TYPE_COPILOT_7});
connect(ui->chooseClass, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index)
{