libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-31 05:43:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up umd bad callback id errors, oops.

Browse Source
This commit is contained in:
Unknown W. Brackets 2013-09-02 03:02:48 -07:00
parent 64b75ed3ff
commit 87bd8d59e2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/HLE/sceKernelThread.cpp
View File

@ -2969,7 +2969,7 @@ void ActionAfterMipsCall::run(MipsCall &call) {
ActionAfterMipsCall *Thread::getRunningCallbackAction()
{
if (this->GetUID() == currentThread && g_inCbCount > 0) {
if (this->GetUID() == currentThread && g_inCbCount > 0) {
MipsCall *call = mipsCalls.get(this->currentMipscallId);
ActionAfterMipsCall *action = 0;
if (call)

8
Core/HLE/sceUmd.cpp
View File

@ -114,7 +114,8 @@ void __UmdStatChange(u64 userdata, int cyclesLate)
void __KernelUmdActivate()
{
u32 notifyArg = PSP_UMD_PRESENT | PSP_UMD_READABLE;
__KernelNotifyCallback(driveCBId, notifyArg);
if (driveCBId != -1)
__KernelNotifyCallback(driveCBId, notifyArg);
// Don't activate immediately, take time to "spin up."
CoreTiming::RemoveAllEvents(umdStatChangeEvent);
@ -124,7 +125,8 @@ void __KernelUmdActivate()
void __KernelUmdDeactivate()
{
u32 notifyArg = PSP_UMD_PRESENT | PSP_UMD_READY;
__KernelNotifyCallback(driveCBId, notifyArg);
if (driveCBId != -1)
__KernelNotifyCallback(driveCBId, notifyArg);
CoreTiming::RemoveAllEvents(umdStatChangeEvent);
__UmdStatChange(0, 0);
@ -256,7 +258,7 @@ int sceUmdDeactivate(u32 mode, const char *name)
u32 sceUmdRegisterUMDCallBack(u32 cbId)
{
int retVal;
int retVal = 0;
// TODO: If the callback is invalid, return PSP_ERROR_UMD_INVALID_PARAM.
if (!kernelObjects.IsValid(cbId)) {