From 940d819d009362089603446daf8b8d0b7b12e2c7 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Tue, 22 Oct 2013 20:15:32 +0800 Subject: [PATCH 1/3] Increase sceUtilityUnloadModule log level --- Core/HLE/sceUtility.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index e52a31d3d3..a7f876dcf1 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -236,7 +236,7 @@ u32 sceUtilityUnloadModule(u32 module) } currentlyLoadedModules.erase(module); - DEBUG_LOG(SCEUTILITY, "sceUtilityUnloadModule(%i)", module); + INFO_LOG(SCEUTILITY, "sceUtilityUnloadModule(%i)", module); // TODO: Each module has its own timing, technically, but this is a low-end. // Note: If not loaded, it should not reschedule actually... if (module == 0x3FF) From ab9f39851a3799aa7c3827019c6bd19e92c201ae Mon Sep 17 00:00:00 2001 From: sum2012 Date: Tue, 22 Oct 2013 20:29:25 +0800 Subject: [PATCH 2/3] correct last time commit seem this should right --- Core/HLE/sceUtility.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index a7f876dcf1..e7ad54b216 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -207,11 +207,11 @@ u32 sceUtilityLoadModule(u32 module) DEBUG_LOG(SCEUTILITY, "sceUtilityLoadModule(%i): already loaded", module); return SCE_ERROR_MODULE_ALREADY_LOADED; } - currentlyLoadedModules.insert(module); - INFO_LOG(SCEUTILITY, "sceUtilityLoadModule(%i)", module); if (module == PSP_MODULE_NET_HTTPSTORAGE && !(currentlyLoadedModules.find(PSP_MODULE_NET_HTTP) != currentlyLoadedModules.end())) //Fix Kamen Rider Climax Heroes OOO - ULJS00331 return SCE_KERNEL_ERROR_LIBRARY_NOTFOUND; + currentlyLoadedModules.insert(module); + // TODO: Each module has its own timing, technically, but this is a low-end. // Note: Some modules have dependencies, but they still resched. if (module == 0x3FF) From 94694ded55ffc50f4df42a8332818356e0863722 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Tue, 22 Oct 2013 21:08:36 +0800 Subject: [PATCH 3/3] Add error log of SCE_KERNEL_ERROR_LIBRARY_NOTFOUND in sceUtilityLoadModule --- Core/HLE/sceUtility.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index e7ad54b216..c20b9baf5b 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -208,12 +208,18 @@ u32 sceUtilityLoadModule(u32 module) return SCE_ERROR_MODULE_ALREADY_LOADED; } INFO_LOG(SCEUTILITY, "sceUtilityLoadModule(%i)", module); - if (module == PSP_MODULE_NET_HTTPSTORAGE && !(currentlyLoadedModules.find(PSP_MODULE_NET_HTTP) != currentlyLoadedModules.end())) //Fix Kamen Rider Climax Heroes OOO - ULJS00331 + //Fix Kamen Rider Climax Heroes OOO - ULJS00331 loading + //Fix Naruto Shippuden Kizuna Drive (error module load failed) + if (module == PSP_MODULE_NET_HTTPSTORAGE && !(currentlyLoadedModules.find(PSP_MODULE_NET_HTTP) != currentlyLoadedModules.end())) + { + ERROR_LOG(SCEUTILITY, "sceUtilityLoadModule: Library not found"); return SCE_KERNEL_ERROR_LIBRARY_NOTFOUND; - currentlyLoadedModules.insert(module); - + } // TODO: Each module has its own timing, technically, but this is a low-end. // Note: Some modules have dependencies, but they still resched. + + currentlyLoadedModules.insert(module); + if (module == 0x3FF) return hleDelayResult(0, "utility module loaded", 130); else