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

cellPad: some readability updates

Browse Source
This commit is contained in:
Megamouse 2023-08-25 21:34:53 +02:00
parent dad07da2e9
commit 656f971823
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
rpcs3/Emu/Cell/Modules/cellPad.cpp
View File

@ -617,19 +617,22 @@ error_code cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
if (i >= config.get_max_connect()) if (i >= config.get_max_connect())
break; break;
info->port_status[i] = config.reported_info[i].port_status; pad_data_internal& reported_info = config.reported_info[i];
config.reported_info[i].port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
info->port_status[i] = reported_info.port_status;
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) reported_info.port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
if (~reported_info.port_status & CELL_PAD_STATUS_CONNECTED)
{ {
continue; continue;
} }
info->device_capability[i] = config.reported_info[i].device_capability; info->device_capability[i] = reported_info.device_capability;
info->device_type[i] = config.reported_info[i].device_type; info->device_type[i] = reported_info.device_type;
info->pclass_type[i] = config.reported_info[i].pclass_type; info->pclass_type[i] = reported_info.pclass_type;
info->pclass_profile[i] = config.reported_info[i].pclass_profile; info->pclass_profile[i] = reported_info.pclass_profile;
now_connect++; now_connect++;
} }
@ -804,16 +807,18 @@ error_code cellPadGetInfo(vm::ptr<CellPadInfo> info)
if (i >= config.get_max_connect()) if (i >= config.get_max_connect())
break; break;
config.reported_info[i].port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; // TODO: should ASSIGN flags be cleared here? pad_data_internal& reported_info = config.reported_info[i];
info->status[i] = config.reported_info[i].port_status; reported_info.port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; // TODO: should ASSIGN flags be cleared here?
if (~config.reported_info[i].port_status & CELL_PAD_STATUS_CONNECTED) info->status[i] = reported_info.port_status;
if (~reported_info.port_status & CELL_PAD_STATUS_CONNECTED)
{ {
continue; continue;
} }
info->vendor_id[i] = config.reported_info[i].vendor_id; info->vendor_id[i] = reported_info.vendor_id;
info->product_id[i] = config.reported_info[i].product_id; info->product_id[i] = reported_info.product_id;
now_connect++; now_connect++;
} }
@ -853,11 +858,14 @@ error_code cellPadGetInfo2(vm::ptr<CellPadInfo2> info)
if (i >= config.get_max_connect()) if (i >= config.get_max_connect())
break; break;
info->port_status[i] = config.reported_info[i].port_status; pad_data_internal& reported_info = config.reported_info[i];
config.reported_info[i].port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
info->port_status[i] = reported_info.port_status;
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) reported_info.port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
if (~reported_info.port_status & CELL_PAD_STATUS_CONNECTED)
{ {
continue; continue;
} }