mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 21:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellPad: Changes to report 0 length if theres no changes

Browse Source
This commit is contained in:
Jake 2014-05-20 19:56:36 -05:00
parent 233b179f65
commit afc5294016
2 changed files with 95 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/Io/PadHandler.h
View File

@ -126,6 +126,7 @@ struct AnalogStick
struct Pad struct Pad
{ {
bool m_buffer_cleared;
u32 m_port_status; u32 m_port_status;
u32 m_port_setting; u32 m_port_setting;
u32 m_device_capability; u32 m_device_capability;
@ -165,7 +166,8 @@ struct Pad
u16 m_sensor_g; u16 m_sensor_g;
Pad(u32 port_status, u32 port_setting, u32 device_capability, u32 device_type) Pad(u32 port_status, u32 port_setting, u32 device_capability, u32 device_type)
: m_port_status(port_status) : m_buffer_cleared(true)
, m_port_status(port_status)
, m_port_setting(port_setting) , m_port_setting(port_setting)
, m_device_capability(device_capability) , m_device_capability(device_capability)
, m_device_type(device_type) , m_device_type(device_type)

113
rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp
View File

@ -75,13 +75,13 @@ int cellPadClearBuf(u32 port_no)
if (port_no >= rinfo.max_connect) return CELL_PAD_ERROR_INVALID_PARAMETER; if (port_no >= rinfo.max_connect) return CELL_PAD_ERROR_INVALID_PARAMETER;
if (port_no >= rinfo.now_connect) return CELL_PAD_ERROR_NO_DEVICE; if (port_no >= rinfo.now_connect) return CELL_PAD_ERROR_NO_DEVICE;
//It seems the system is supposed keeps track of previous values, and reports paddata with len 0 if //Set 'm_buffer_cleared' to force a resend of everything
//nothing has changed. //might as well also reset everything in our pad 'buffer' to nothing as well
//We can at least reset the pad back to its default values for now
std::vector<Pad>& pads = Emu.GetPadManager().GetPads(); std::vector<Pad>& pads = Emu.GetPadManager().GetPads();
Pad& pad = pads[port_no]; Pad& pad = pads[port_no];
pad.m_buffer_cleared = true;
pad.m_analog_left_x = pad.m_analog_left_y = pad.m_analog_right_x = pad.m_analog_right_y = 128; pad.m_analog_left_x = pad.m_analog_left_y = pad.m_analog_right_x = pad.m_analog_right_y = 128;
pad.m_digital_1 = pad.m_digital_2 = 0; pad.m_digital_1 = pad.m_digital_2 = 0;
@ -110,10 +110,14 @@ int cellPadGetData(u32 port_no, u32 data_addr)
CellPadData data; CellPadData data;
memset(&data, 0, sizeof(CellPadData)); memset(&data, 0, sizeof(CellPadData));
u16 d1Initial, d2Initial;
d1Initial = pad.m_digital_1;
d2Initial = pad.m_digital_2;
bool btnChanged = false;
for(Button& button : pad.m_buttons) for(Button& button : pad.m_buttons)
{ {
//using an if/else here, not doing switch in switch //here we check btns, and set pad accordingly,
//plus side is this gives us the ability to check if anything changed eventually //if something changed, set btnChanged
if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1) if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
{ {
@ -122,10 +126,22 @@ int cellPadGetData(u32 port_no, u32 data_addr)
switch (button.m_outKeyCode) switch (button.m_outKeyCode)
{ {
case CELL_PAD_CTRL_LEFT: pad.m_press_left = button.m_value; break; case CELL_PAD_CTRL_LEFT:
case CELL_PAD_CTRL_DOWN: pad.m_press_down = button.m_value; break; if (pad.m_press_left != button.m_value) btnChanged = true;
case CELL_PAD_CTRL_RIGHT: pad.m_press_right = button.m_value; break; pad.m_press_left = button.m_value;
case CELL_PAD_CTRL_UP: pad.m_press_up = button.m_value; break; break;
case CELL_PAD_CTRL_DOWN:
if (pad.m_press_down != button.m_value) btnChanged = true;
pad.m_press_down = button.m_value;
break;
case CELL_PAD_CTRL_RIGHT:
if (pad.m_press_right != button.m_value) btnChanged = true;
pad.m_press_right = button.m_value;
break;
case CELL_PAD_CTRL_UP:
if (pad.m_press_up != button.m_value) btnChanged = true;
pad.m_press_up = button.m_value;
break;
//These arent pressure btns //These arent pressure btns
case CELL_PAD_CTRL_R3: case CELL_PAD_CTRL_R3:
case CELL_PAD_CTRL_L3: case CELL_PAD_CTRL_L3:
@ -141,14 +157,38 @@ int cellPadGetData(u32 port_no, u32 data_addr)
switch (button.m_outKeyCode) switch (button.m_outKeyCode)
{ {
case CELL_PAD_CTRL_SQUARE: pad.m_press_square = button.m_value; break; case CELL_PAD_CTRL_SQUARE:
case CELL_PAD_CTRL_CROSS: pad.m_press_cross = button.m_value; break; if (pad.m_press_square != button.m_value) btnChanged = true;
case CELL_PAD_CTRL_CIRCLE: pad.m_press_circle = button.m_value; break; pad.m_press_square = button.m_value;
case CELL_PAD_CTRL_TRIANGLE: pad.m_press_triangle = button.m_value; break; break;
case CELL_PAD_CTRL_R1: pad.m_press_R1 = button.m_value; break; case CELL_PAD_CTRL_CROSS:
case CELL_PAD_CTRL_L1: pad.m_press_L1 = button.m_value; break; if (pad.m_press_cross != button.m_value) btnChanged = true;
case CELL_PAD_CTRL_R2: pad.m_press_R2 = button.m_value; break; pad.m_press_cross = button.m_value;
case CELL_PAD_CTRL_L2: pad.m_press_L2 = button.m_value; break; break;
case CELL_PAD_CTRL_CIRCLE:
if (pad.m_press_circle != button.m_value) btnChanged = true;
pad.m_press_circle = button.m_value;
break;
case CELL_PAD_CTRL_TRIANGLE:
if (pad.m_press_triangle != button.m_value) btnChanged = true;
pad.m_press_triangle = button.m_value;
break;
case CELL_PAD_CTRL_R1:
if (pad.m_press_R1 != button.m_value) btnChanged = true;
pad.m_press_R1 = button.m_value;
break;
case CELL_PAD_CTRL_L1:
if (pad.m_press_L1 != button.m_value) btnChanged = true;
pad.m_press_L1 = button.m_value;
break;
case CELL_PAD_CTRL_R2:
if (pad.m_press_R2 != button.m_value) btnChanged = true;
pad.m_press_R2 = button.m_value;
break;
case CELL_PAD_CTRL_L2:
if (pad.m_press_L2 != button.m_value) btnChanged = true;
pad.m_press_L2 = button.m_value;
break;
default: break; default: break;
} }
} }
@ -165,15 +205,44 @@ int cellPadGetData(u32 port_no, u32 data_addr)
{ {
switch (stick.m_offset) switch (stick.m_offset)
{ {
case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X: pad.m_analog_left_x = stick.m_value; break; case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X:
case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y: pad.m_analog_left_y = stick.m_value; break; if (pad.m_analog_left_x != stick.m_value) btnChanged = true;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X: pad.m_analog_right_x = stick.m_value; break; pad.m_analog_left_x = stick.m_value;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y: pad.m_analog_right_y = stick.m_value; break; break;
case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y:
if (pad.m_analog_left_y != stick.m_value) btnChanged = true;
pad.m_analog_left_y = stick.m_value;
break;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X:
if (pad.m_analog_right_x != stick.m_value) btnChanged = true;
pad.m_analog_right_x = stick.m_value;
break;
case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y:
if (pad.m_analog_right_y != stick.m_value) btnChanged = true;
pad.m_analog_right_y = stick.m_value;
break;
default: break; default: break;
} }
} }
if (d1Initial != pad.m_digital_1 || d2Initial != pad.m_digital_2)
{
btnChanged = true;
}
data.len = pad.m_buttons.size(); //not sure if this should officially change with capabilities/portsettings :(
data.len = CELL_PAD_MAX_CODES;
//report len 0 if nothing changed and if we havent recently cleared buffer
if (pad.m_buffer_cleared)
{
pad.m_buffer_cleared = false;
}
else if (!btnChanged)
{
data.len = 0;
}
//lets still send new data anyway, not sure whats expected still
data.button[CELL_PAD_BTN_OFFSET_DIGITAL1] = pad.m_digital_1; data.button[CELL_PAD_BTN_OFFSET_DIGITAL1] = pad.m_digital_1;
data.button[CELL_PAD_BTN_OFFSET_DIGITAL2] = pad.m_digital_2; data.button[CELL_PAD_BTN_OFFSET_DIGITAL2] = pad.m_digital_2;
data.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X] = pad.m_analog_right_x; data.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X] = pad.m_analog_right_x;