Merge pull request #4288 from sum2012/log

Fix Naruto Shippuden Kizuna Drive (error module load failed)
This commit is contained in:
Henrik Rydgård 2013-10-22 06:27:12 -07:00
commit 7fd6a7e06b

View File

@ -207,13 +207,19 @@ 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
//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;
}
// 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
@ -236,7 +242,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)