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

Fix cellMouse/Keyboard initialization

Browse Source
This commit is contained in:
Eladash 2021-06-17 20:20:11 +03:00 committed by Megamouse
parent 9fadd48ea3
commit 039ca6e839
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,13 +37,16 @@ error_code cellKbInit(u32 max_connect)
auto& handler = g_fxo->get<KeyboardHandlerBase>(); auto& handler = g_fxo->get<KeyboardHandlerBase>();
const auto init = handler.init.init(); auto init = handler.init.init();
if (!init) if (!init)
return CELL_KB_ERROR_ALREADY_INITIALIZED; return CELL_KB_ERROR_ALREADY_INITIALIZED;
if (max_connect == 0 || max_connect > CELL_KB_MAX_KEYBOARDS) if (max_connect == 0 || max_connect > CELL_KB_MAX_KEYBOARDS)
{
init.cancel();
return CELL_KB_ERROR_INVALID_PARAMETER; return CELL_KB_ERROR_INVALID_PARAMETER;
}
libio_sys_config_init(); libio_sys_config_init();
handler.Init(std::min(max_connect, 7u)); handler.Init(std::min(max_connect, 7u));

3
rpcs3/Emu/Cell/Modules/cellMouse.cpp
View File

@ -38,13 +38,14 @@ error_code cellMouseInit(u32 max_connect)
auto& handler = g_fxo->get<MouseHandlerBase>(); auto& handler = g_fxo->get<MouseHandlerBase>();
const auto init = handler.init.init(); auto init = handler.init.init();
if (!init) if (!init)
return CELL_MOUSE_ERROR_ALREADY_INITIALIZED; return CELL_MOUSE_ERROR_ALREADY_INITIALIZED;
if (max_connect == 0 || max_connect > CELL_MAX_MICE) if (max_connect == 0 || max_connect > CELL_MAX_MICE)
{ {
init.cancel();
return CELL_MOUSE_ERROR_INVALID_PARAMETER; return CELL_MOUSE_ERROR_INVALID_PARAMETER;
} }