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

Fix cellPadSetPortSetting (#3980)

Browse Source 
* Don't skip setting port settings when no controller is connected
* DS4: fix error message
This commit is contained in:
Megamouse 2017-12-24 15:47:36 +01:00 committed by Ani
parent 8a3759f479
commit fc2ef5529d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,12 +524,13 @@ s32 cellPadSetPortSetting(u32 port_no, u32 port_setting)
if (port_no >= rinfo.max_connect)
return CELL_PAD_ERROR_INVALID_PARAMETER;
if (port_no >= rinfo.now_connect)
return CELL_PAD_ERROR_NO_DEVICE;
auto& pads = handler->GetPads();
pads[port_no]->m_port_setting = port_setting;
if (port_no >= rinfo.now_connect)
return CELL_PAD_ERROR_NO_DEVICE;
return CELL_OK;
}

2
rpcs3/ds4_pad_handler.cpp
View File

@ -723,7 +723,7 @@ bool ds4_pad_handler::Init()
if (dev)
CheckAddDevice(dev, devInfo);
else
LOG_ERROR(HLE, "[DS4] hid_open_path failed! Reason: %S", hid_error(dev));
LOG_ERROR(HLE, "[DS4] hid_open_path failed! Reason: %s", hid_error(dev));
devInfo = devInfo->next;
}
hid_free_enumeration(head);