kb/mouse: fix max in init

finap · Jun 21, 2017 · f77e9f8 · f77e9f8
1 parent 9cc52c7
commit f77e9f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/rpcs3/Emu/Cell/Modules/cellKb.cpp b/rpcs3/Emu/Cell/Modules/cellKb.cpp
@@ -35,15 +35,12 @@ error_code cellKbInit(u32 max_connect)
 {
 	sys_io.warning("cellKbInit(max_connect=%d)", max_connect);
 
-	if (max_connect > 7)
-		return CELL_KB_ERROR_INVALID_PARAMETER;
-
 	const auto handler = fxm::import<KeyboardHandlerBase>(Emu.GetCallbacks().get_kb_handler);
 
 	if (!handler)
 		return CELL_KB_ERROR_ALREADY_INITIALIZED;
 
-	handler->Init(max_connect);
+	handler->Init(std::min(max_connect, 7u));
 
 	return CELL_OK;
 }

diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.cpp b/rpcs3/Emu/Cell/Modules/cellMouse.cpp
@@ -12,19 +12,14 @@ s32 cellMouseInit(u32 max_connect)
 {
 	sys_io.warning("cellMouseInit(max_connect=%d)", max_connect);
 
-	if (max_connect > 7)
-	{
-		return CELL_MOUSE_ERROR_INVALID_PARAMETER;
-	}
-
 	const auto handler = fxm::import<MouseHandlerBase>(Emu.GetCallbacks().get_mouse_handler);
 
 	if (!handler)
 	{
 		return CELL_MOUSE_ERROR_ALREADY_INITIALIZED;
 	}
 
-	handler->Init(max_connect);
+	handler->Init(std::min(max_connect, 7u));
 	return CELL_OK;
 }