mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-09 04:26:26 +02:00
Merge pull request #5293 from sum2012/patch-5
Add more log information in sceUtlity
This commit is contained in:
Henrik Rydgård committed
commit
ef3ccbec4b
1 file changed
+56
-55
+56
-55
@@ -122,9 +122,9 @@ int sceUtilitySavedataInitStart(u32 paramAddr)
|
||||
}
|
||||
currentDialogType = UTILITY_DIALOG_SAVEDATA;
|
||||
currentDialogActive = true;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY,"sceUtilitySavedataInitStart(%08x)", paramAddr);
|
||||
return saveDialog.Init(paramAddr);
|
||||
int ret = saveDialog.Init(paramAddr);
|
||||
DEBUG_LOG(SCEUTILITY,"%08x=sceUtilitySavedataInitStart(%08x)",ret,paramAddr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilitySavedataShutdownStart()
|
||||
@@ -135,9 +135,9 @@ int sceUtilitySavedataShutdownStart()
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
currentDialogActive = false;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY,"sceUtilitySavedataShutdownStart()");
|
||||
return saveDialog.Shutdown();
|
||||
int ret = saveDialog.Shutdown();
|
||||
DEBUG_LOG(SCEUTILITY,"%08x=sceUtilitySavedataShutdownStart()",ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilitySavedataGetStatus()
|
||||
@@ -160,9 +160,9 @@ int sceUtilitySavedataUpdate(int animSpeed)
|
||||
WARN_LOG(SCEUTILITY, "sceUtilitySavedataUpdate(): wrong dialog type");
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
|
||||
DEBUG_LOG(SCEUTILITY,"sceUtilitySavedataUpdate(%d)", animSpeed);
|
||||
|
||||
int result = saveDialog.Update(animSpeed);
|
||||
DEBUG_LOG(SCEUTILITY,"%08x=sceUtilitySavedataUpdate(%d)",result,animSpeed);
|
||||
if (result >= 0)
|
||||
return hleDelayResult(result, "savedata update", 300);
|
||||
return result;
|
||||
@@ -185,13 +185,13 @@ u32 sceUtilityLoadAvModule(u32 module)
|
||||
return SCE_ERROR_AV_MODULE_BAD_ID;
|
||||
}
|
||||
|
||||
DEBUG_LOG(SCEUTILITY,"sceUtilityLoadAvModule(%i)", module);
|
||||
DEBUG_LOG(SCEUTILITY,"0=sceUtilityLoadAvModule(%i)", module);
|
||||
return hleDelayResult(0, "utility av module loaded", 25000);
|
||||
}
|
||||
|
||||
u32 sceUtilityUnloadAvModule(u32 module)
|
||||
{
|
||||
DEBUG_LOG(SCEUTILITY,"sceUtilityUnloadAvModule(%i)", module);
|
||||
DEBUG_LOG(SCEUTILITY,"0=sceUtilityUnloadAvModule(%i)", module);
|
||||
return hleDelayResult(0, "utility av module unloaded", 800);
|
||||
}
|
||||
|
||||
@@ -262,9 +262,9 @@ int sceUtilityMsgDialogInitStart(u32 structAddr)
|
||||
}
|
||||
currentDialogType = UTILITY_DIALOG_MSG;
|
||||
currentDialogActive = true;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityMsgDialogInitStart(%08x)", structAddr);
|
||||
return msgDialog.Init(structAddr);
|
||||
int ret = msgDialog.Init(structAddr);
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityMsgDialogInitStart(%08x)",ret,structAddr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityMsgDialogShutdownStart()
|
||||
@@ -275,9 +275,9 @@ int sceUtilityMsgDialogShutdownStart()
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
currentDialogActive = false;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityMsgDialogShutdownStart()");
|
||||
return msgDialog.Shutdown();
|
||||
int ret = msgDialog.Shutdown();
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityMsgDialogShutdownStart()",ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityMsgDialogUpdate(int animSpeed)
|
||||
@@ -287,9 +287,9 @@ int sceUtilityMsgDialogUpdate(int animSpeed)
|
||||
WARN_LOG(SCEUTILITY, "sceUtilityMsgDialogUpdate(): wrong dialog type");
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
|
||||
DEBUG_LOG(SCEUTILITY,"sceUtilityMsgDialogUpdate(%i)", animSpeed);
|
||||
return msgDialog.Update(animSpeed);
|
||||
int ret = msgDialog.Update(animSpeed);
|
||||
DEBUG_LOG(SCEUTILITY,"%08x=sceUtilityMsgDialogUpdate(%i)",ret,animSpeed);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityMsgDialogGetStatus()
|
||||
@@ -312,9 +312,9 @@ int sceUtilityMsgDialogAbort()
|
||||
WARN_LOG(SCEUTILITY, "sceUtilityMsgDialogAbort(): wrong dialog type");
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityMsgDialogAbort()");
|
||||
return msgDialog.Abort();
|
||||
int ret = msgDialog.Abort();
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityMsgDialogAbort()",ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -329,9 +329,9 @@ int sceUtilityOskInitStart(u32 oskPtr)
|
||||
}
|
||||
currentDialogType = UTILITY_DIALOG_OSK;
|
||||
currentDialogActive = true;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityOskInitStart(%08x)", oskPtr);
|
||||
return oskDialog.Init(oskPtr);
|
||||
int ret = oskDialog.Init(oskPtr);
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityOskInitStart(%08x)", oskPtr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityOskShutdownStart()
|
||||
@@ -342,9 +342,9 @@ int sceUtilityOskShutdownStart()
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
currentDialogActive = false;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityOskShutdownStart()");
|
||||
return oskDialog.Shutdown();
|
||||
int ret = oskDialog.Shutdown();
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityOskShutdownStart()",ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityOskUpdate(int animSpeed)
|
||||
@@ -354,9 +354,9 @@ int sceUtilityOskUpdate(int animSpeed)
|
||||
WARN_LOG(SCEUTILITY, "sceUtilityMsgDialogUpdate(): wrong dialog type");
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityOskUpdate(%i)", animSpeed);
|
||||
return oskDialog.Update(animSpeed);
|
||||
int ret = oskDialog.Update(animSpeed);
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityOskUpdate(%i)",ret,animSpeed);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityOskGetStatus()
|
||||
@@ -388,9 +388,9 @@ int sceUtilityNetconfInitStart(u32 paramsAddr)
|
||||
}
|
||||
currentDialogType = UTILITY_DIALOG_NET;
|
||||
currentDialogActive = true;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityNetconfInitStart(%08x)", paramsAddr);
|
||||
return netDialog.Init(paramsAddr);
|
||||
int ret = netDialog.Init(paramsAddr);
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityNetconfInitStart(%08x)",ret,paramsAddr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityNetconfShutdownStart(unsigned int unknown)
|
||||
@@ -400,15 +400,16 @@ int sceUtilityNetconfShutdownStart(unsigned int unknown)
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
currentDialogActive = false;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityNetconfShutdownStart()");
|
||||
return netDialog.Shutdown();
|
||||
int ret = netDialog.Shutdown();
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityNetconfShutdownStart()",ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityNetconfUpdate(int animSpeed)
|
||||
{
|
||||
ERROR_LOG(SCEUTILITY, "UNIMPL sceUtilityNetconfUpdate(%i)", animSpeed);
|
||||
return netDialog.Update(animSpeed);
|
||||
int ret = netDialog.Update(animSpeed);
|
||||
ERROR_LOG(SCEUTILITY, "UNIMPL %08x=sceUtilityNetconfUpdate(%i)",ret,animSpeed);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityNetconfGetStatus()
|
||||
@@ -436,7 +437,7 @@ u32 sceUtilityScreenshotInitStart(u32 unknown1, u32 unknown2, u32 unknown3, u32
|
||||
currentDialogActive = true;
|
||||
|
||||
u32 retval = screenshotDialog.Init();
|
||||
WARN_LOG_REPORT(SCEUTILITY, "UNIMPL %i=sceUtilityScreenshotInitStart(%x, %x, %x, %x, %x, %x)", retval, unknown1, unknown2, unknown3, unknown4, unknown5, unknown6);
|
||||
WARN_LOG_REPORT(SCEUTILITY, "UNIMPL %08x=sceUtilityScreenshotInitStart(%x, %x, %x, %x, %x, %x)", retval, unknown1, unknown2, unknown3, unknown4, unknown5, unknown6);
|
||||
return retval;
|
||||
}
|
||||
|
||||
@@ -448,9 +449,9 @@ u32 sceUtilityScreenshotShutdownStart()
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
currentDialogActive = false;
|
||||
|
||||
WARN_LOG(SCEUTILITY, "UNTESTED sceUtilityScreenshotShutdownStart()");
|
||||
return screenshotDialog.Shutdown();
|
||||
int ret = screenshotDialog.Shutdown();
|
||||
WARN_LOG(SCEUTILITY, "UNTESTED %08x=sceUtilityScreenshotShutdownStart()",ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
u32 sceUtilityScreenshotUpdate(u32 animSpeed)
|
||||
@@ -460,8 +461,8 @@ u32 sceUtilityScreenshotUpdate(u32 animSpeed)
|
||||
WARN_LOG(SCEUTILITY, "sceUtilityScreenshotUpdate(): wrong dialog type");
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
|
||||
ERROR_LOG(SCEUTILITY, "UNIMPL sceUtilityScreenshotUpdate(%d)", animSpeed);
|
||||
int ret = screenshotDialog.Update(animSpeed);
|
||||
ERROR_LOG(SCEUTILITY, "UNIMPL %08x=sceUtilityScreenshotUpdate(%d)",ret,animSpeed);
|
||||
return screenshotDialog.Update(animSpeed);
|
||||
}
|
||||
|
||||
@@ -474,7 +475,7 @@ int sceUtilityScreenshotGetStatus()
|
||||
}
|
||||
|
||||
u32 retval = screenshotDialog.GetStatus();
|
||||
WARN_LOG(SCEUTILITY, "UNIMPL %i=sceUtilityScreenshotGetStatus()", retval);
|
||||
WARN_LOG(SCEUTILITY, "UNIMPL %08x=sceUtilityScreenshotGetStatus()", retval);
|
||||
return retval;
|
||||
}
|
||||
|
||||
@@ -487,9 +488,9 @@ int sceUtilityGamedataInstallInitStart(u32 paramsAddr)
|
||||
}
|
||||
currentDialogType = UTILITY_DIALOG_GAMEDATAINSTALL;
|
||||
currentDialogActive = true;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityGamedataInstallInitStart(%08x)", paramsAddr);
|
||||
return gamedataInstallDialog.Init(paramsAddr);
|
||||
int ret = gamedataInstallDialog.Init(paramsAddr);
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityGamedataInstallInitStart(%08x)",ret,paramsAddr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityGamedataInstallShutdownStart() {
|
||||
@@ -510,9 +511,9 @@ int sceUtilityGamedataInstallUpdate(int animSpeed) {
|
||||
WARN_LOG(SCEUTILITY, "sceUtilityGamedataInstallUpdate(): wrong dialog type");
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityGamedataInstallUpdate(%i)", animSpeed);
|
||||
return gamedataInstallDialog.Update(animSpeed);
|
||||
int ret = gamedataInstallDialog.Update(animSpeed);
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityGamedataInstallUpdate(%i)",ret,animSpeed);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int sceUtilityGamedataInstallGetStatus()
|
||||
@@ -537,9 +538,9 @@ int sceUtilityGamedataInstallAbort()
|
||||
return SCE_ERROR_UTILITY_WRONG_TYPE;
|
||||
}
|
||||
currentDialogActive = false;
|
||||
|
||||
DEBUG_LOG(SCEUTILITY, "sceUtilityGamedataInstallDialogAbort");
|
||||
return gamedataInstallDialog.Abort();
|
||||
int ret = gamedataInstallDialog.Abort();
|
||||
DEBUG_LOG(SCEUTILITY, "%08x=sceUtilityGamedataInstallDialogAbort",ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
//TODO: should save to config file
|
||||
|
||||
Reference in new issue
Block a user