From 26d3bfe9c2c5d447b17e78b5360f609c85921612 Mon Sep 17 00:00:00 2001 From: S Gopal Rajagopal Date: Fri, 20 Feb 2015 02:16:25 +0530 Subject: [PATCH] SPURS: Disable kernel --- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 16 ++++++++++------ rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp | 12 ++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index 263f91a667..08d14fb48a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -2284,14 +2284,18 @@ s32 cellSpursShutdownTaskset(vm::ptr taskset) u32 _cellSpursGetSdkVersion() { - s32 sdk_version; + // Commenting this out for now since process_get_sdk_version does not return + // the correct SDK version and instead returns a version too high for the game + // and causes SPURS to fail. + //s32 sdk_version; - if (process_get_sdk_version(process_getpid(), sdk_version) != CELL_OK) - { - throw __FUNCTION__; - } + //if (process_get_sdk_version(process_getpid(), sdk_version) != CELL_OK) + //{ + // throw __FUNCTION__; + //} - return sdk_version; + //return sdk_version; + return 1; } s32 spursCreateTask(vm::ptr taskset, vm::ptr task_id, vm::ptr elf_addr, vm::ptr context_addr, u32 context_size, vm::ptr ls_pattern, vm::ptr arg) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp index 8f7519d6bb..25c2911a8f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpursSpu.cpp @@ -525,12 +525,12 @@ bool spursKernelWorkloadExit(SPUThread & spu) { /// SPURS kernel entry point bool spursKernelEntry(SPUThread & spu) { - //while (true) { - // std::this_thread::sleep_for(std::chrono::milliseconds(100)); - // if (Emu.IsStopped()) { - // return false; - // } - //} + while (true) { + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + if (Emu.IsStopped()) { + return false; + } + } auto ctxt = vm::get_ptr(spu.ls_offset + 0x100); memset(ctxt, 0, sizeof(SpursKernelContext));