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

Fixup cellPadPeriphGetInfo

Browse source
This commit is contained in:
Eladash 2023-08-19 13:29:46 +03:00 • committed by Elad Ashkenazi
parent 9635417ae5
commit 8236a0fa2d
2 changed files with 98 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,14 +82,61 @@ void cellPad_NotifyStateChange(u32 index, u32 state)
return; return;
} }
const u32 old = info->reported_statuses[index]; const auto handler = pad::get_current_handler();
const auto& pads = handler->GetPads();
const u32 old = info->reported_info[index].port_status;
// Ignore sent status for now, use the latest instead
state = (pads[index]->m_port_status & CELL_PAD_STATUS_CONNECTED);
if (~(old ^ state) & CELL_PAD_STATUS_CONNECTED) if (~(old ^ state) & CELL_PAD_STATUS_CONNECTED)
{ {
return; return;
} }
info->reported_statuses[index] = (state & CELL_PAD_STATUS_CONNECTED) | CELL_PAD_STATUS_ASSIGN_CHANGES; info->reported_info[index].port_status = (state & CELL_PAD_STATUS_CONNECTED) | CELL_PAD_STATUS_ASSIGN_CHANGES;
info->reported_info[index].device_capability = pads[index]->m_device_capability;
info->reported_info[index].device_type = pads[index]->m_device_type;
info->reported_info[index].pclass_type = pads[index]->m_class_type;
info->reported_info[index].pclass_profile = pads[index]->m_class_profile;
if (pads[index]->m_vendor_id == 0 || pads[index]->m_product_id == 0)
{
// Fallback to defaults
input::product_info product;
switch (pads[index]->m_class_type)
{
case CELL_PAD_PCLASS_TYPE_GUITAR:
product = input::get_product_info(input::product_type::red_octane_gh_guitar);
break;
case CELL_PAD_PCLASS_TYPE_DRUM:
product = input::get_product_info(input::product_type::red_octane_gh_drum_kit);
break;
case CELL_PAD_PCLASS_TYPE_DJ:
product = input::get_product_info(input::product_type::dj_hero_turntable);
break;
case CELL_PAD_PCLASS_TYPE_DANCEMAT:
product = input::get_product_info(input::product_type::dance_dance_revolution_mat);
break;
case CELL_PAD_PCLASS_TYPE_NAVIGATION:
case CELL_PAD_PCLASS_TYPE_STANDARD:
default:
product = input::get_product_info(input::product_type::playstation_3_controller);
break;
}
info->reported_info[index].vendor_id = product.vendor_id;
info->reported_info[index].product_id = product.product_id;
}
else
{
info->reported_info[index].vendor_id = pads[index]->m_vendor_id;
info->reported_info[index].product_id = pads[index]->m_product_id;
}
} }
extern void pad_state_notify_state_change(u32 index, u32 state) extern void pad_state_notify_state_change(u32 index, u32 state)
@ -115,7 +162,7 @@ error_code cellPadInit(ppu_thread& ppu, u32 max_connect)
config.max_connect = max_connect; config.max_connect = max_connect;
config.port_setting.fill(CELL_PAD_SETTING_PRESS_OFF | CELL_PAD_SETTING_SENSOR_OFF); config.port_setting.fill(CELL_PAD_SETTING_PRESS_OFF | CELL_PAD_SETTING_SENSOR_OFF);
config.reported_statuses = {}; config.reported_info = {};
std::array<s32, CELL_MAX_PADS> statuses{}; std::array<s32, CELL_MAX_PADS> statuses{};
@ -459,25 +506,36 @@ error_code cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
std::memset(info.get_ptr(), 0, sizeof(CellPadPeriphInfo)); std::memset(info.get_ptr(), 0, sizeof(CellPadPeriphInfo));
info->max_connect = config.max_connect; info->max_connect = config.max_connect;
info->now_connect = rinfo.now_connect;
info->system_info = rinfo.system_info; info->system_info = rinfo.system_info;
const auto& pads = handler->GetPads(); const auto& pads = handler->GetPads();
u32 now_connect = 0;
for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; ++i) for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; ++i)
{ {
if (i >= config.get_max_connect()) if (i >= config.get_max_connect())
break; break;
info->port_status[i] = pads[i]->m_port_status; info->port_status[i] = config.reported_info[i].port_status;
pads[i]->m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; config.reported_info[i].port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
info->port_setting[i] = config.port_setting[i]; info->port_setting[i] = config.port_setting[i];
info->device_capability[i] = pads[i]->m_device_capability;
info->device_type[i] = pads[i]->m_device_type; if (~config.reported_info[i].port_status & CELL_PAD_STATUS_CONNECTED)
info->pclass_type[i] = pads[i]->m_class_type; {
info->pclass_profile[i] = pads[i]->m_class_profile; continue;
} }
info->device_capability[i] = config.reported_info[i].device_capability;
info->device_type[i] = config.reported_info[i].device_type;
info->pclass_type[i] = config.reported_info[i].pclass_type;
info->pclass_profile[i] = config.reported_info[i].pclass_profile;
now_connect++;
}
info->now_connect = now_connect;
return CELL_OK; return CELL_OK;
} }
@ -649,54 +707,20 @@ error_code cellPadGetInfo(vm::ptr<CellPadInfo> info)
if (i >= config.get_max_connect()) if (i >= config.get_max_connect())
break; break;
if (!config.is_reportedly_connected(i)) config.reported_info[i].port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; // TODO: should ASSIGN flags be cleared here?
info->status[i] = config.reported_info[i].port_status;
if (~config.reported_info[i].port_status & CELL_PAD_STATUS_CONNECTED)
{
continue; continue;
}
config.reported_statuses[i] &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; // TODO: should ASSIGN flags be cleared here? info->vendor_id[i] = config.reported_info[i].vendor_id;
info->status[i] = config.reported_statuses[i]; info->product_id[i] = config.reported_info[i].product_id;
if (config.reported_statuses[i] & CELL_PAD_STATUS_CONNECTED)
{
now_connect++; now_connect++;
} }
if (pads[i]->m_vendor_id == 0 || pads[i]->m_product_id == 0)
{
// Fallback to defaults
input::product_info product;
switch (pads[i]->m_class_type)
{
case CELL_PAD_PCLASS_TYPE_GUITAR:
product = input::get_product_info(input::product_type::red_octane_gh_guitar);
break;
case CELL_PAD_PCLASS_TYPE_DRUM:
product = input::get_product_info(input::product_type::red_octane_gh_drum_kit);
break;
case CELL_PAD_PCLASS_TYPE_DJ:
product = input::get_product_info(input::product_type::dj_hero_turntable);
break;
case CELL_PAD_PCLASS_TYPE_DANCEMAT:
product = input::get_product_info(input::product_type::dance_dance_revolution_mat);
break;
case CELL_PAD_PCLASS_TYPE_NAVIGATION:
case CELL_PAD_PCLASS_TYPE_STANDARD:
default:
product = input::get_product_info(input::product_type::playstation_3_controller);
break;
}
info->vendor_id[i] = product.vendor_id;
info->product_id[i] = product.product_id;
}
else
{
info->vendor_id[i] = pads[i]->m_vendor_id;
info->product_id[i] = pads[i]->m_product_id;
}
}
info->now_connect = now_connect; info->now_connect = now_connect;
return CELL_OK; return CELL_OK;
} }
@ -732,20 +756,20 @@ error_code cellPadGetInfo2(vm::ptr<CellPadInfo2> info)
if (i >= config.get_max_connect()) if (i >= config.get_max_connect())
break; break;
if (!config.is_reportedly_connected(i)) info->port_status[i] = config.reported_info[i].port_status;
continue; config.reported_info[i].port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
info->port_status[i] = config.reported_statuses[i];
config.reported_statuses[i] &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
info->port_setting[i] = config.port_setting[i]; info->port_setting[i] = config.port_setting[i];
if (~config.reported_info[i].port_status & CELL_PAD_STATUS_CONNECTED)
{
continue;
}
info->device_capability[i] = pads[i]->m_device_capability; info->device_capability[i] = pads[i]->m_device_capability;
info->device_type[i] = pads[i]->m_device_type; info->device_type[i] = pads[i]->m_device_type;
if (config.reported_statuses[i] & CELL_PAD_STATUS_CONNECTED)
{
now_connect++; now_connect++;
} }
}
info->now_connect = now_connect; info->now_connect = now_connect;
return CELL_OK; return CELL_OK;

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

@ -126,6 +126,17 @@ enum
CELL_PADFILTER_IIR_CUTOFF_2ND_LPF_BT_010 = 2, // 10% Nyquist frequency CELL_PADFILTER_IIR_CUTOFF_2ND_LPF_BT_010 = 2, // 10% Nyquist frequency
}; };
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;
};
struct CellPadInfo struct CellPadInfo
{ {
be_t<u32> max_connect; be_t<u32> max_connect;
@ -192,7 +203,7 @@ struct pad_info
{ {
atomic_t<u32> max_connect = 0; atomic_t<u32> max_connect = 0;
std::array<u32, CELL_PAD_MAX_PORT_NUM> port_setting{ 0 }; std::array<u32, CELL_PAD_MAX_PORT_NUM> port_setting{ 0 };
std::array<u32, CELL_PAD_MAX_PORT_NUM> reported_statuses{}; std::array<pad_data_internal, CELL_PAD_MAX_PORT_NUM> reported_info{};
SAVESTATE_INIT_POS(11); SAVESTATE_INIT_POS(11);
@ -209,7 +220,7 @@ struct pad_info
// This result relies on data updates from config events on a dedicated thread to receive them // This result relies on data updates from config events on a dedicated thread to receive them
bool is_reportedly_connected(u32 port_no) const bool is_reportedly_connected(u32 port_no) const
{ {
return port_no < get_max_connect() && !!(reported_statuses[port_no] & CELL_PAD_STATUS_CONNECTED); return port_no < get_max_connect() && !!(reported_info[port_no].port_status & CELL_PAD_STATUS_CONNECTED);
} }
}; };