Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-11 09:05:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Consolidate the last spread-out error codes.

Browse Source
This commit is contained in:
Henrik Rydgård 2025-02-04 12:34:49 -06:00
parent d2c1c7b54f
commit d1e5b45b4b
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/Dialog/PSPMsgDialog.cpp
View File

@ -76,7 +76,7 @@ int PSPMsgDialog::Init(unsigned int paramAddr) {
if(messageDialog.type == 0 && !(messageDialog.errorNum & 0x80000000))
{
flag |= DS_ERROR;
messageDialog.result = SCE_UTILITY_MSGDIALOG_ERROR_ERRORCODEINVALID;
messageDialog.result = SCE_ERROR_UTILITY_MSGDIALOG_ERRORCODEINVALID;
}
else if(size == SCE_UTILITY_MSGDIALOG_SIZE_V2 && messageDialog.type == 1)
{
@ -86,7 +86,7 @@ int PSPMsgDialog::Init(unsigned int paramAddr) {
if (((messageDialog.options | validOp) ^ validOp) != 0)
{
flag |= DS_ERROR;
messageDialog.result = SCE_UTILITY_MSGDIALOG_ERROR_BADOPTION;
messageDialog.result = SCE_ERROR_UTILITY_MSGDIALOG_BADOPTION;
}
}
else if(size == SCE_UTILITY_MSGDIALOG_SIZE_V3)
@ -95,12 +95,12 @@ int PSPMsgDialog::Init(unsigned int paramAddr) {
!(messageDialog.options & SCE_UTILITY_MSGDIALOG_OPTION_YESNO))
{
flag |= DS_ERROR;
messageDialog.result = SCE_UTILITY_MSGDIALOG_ERROR_BADOPTION;
messageDialog.result = SCE_ERROR_UTILITY_MSGDIALOG_BADOPTION;
}
if (messageDialog.options & ~SCE_UTILITY_MSGDIALOG_OPTION_SUPPORTED)
{
flag |= DS_ERROR;
messageDialog.result = SCE_UTILITY_MSGDIALOG_ERROR_BADOPTION;
messageDialog.result = SCE_ERROR_UTILITY_MSGDIALOG_BADOPTION;
}
}

3
Core/Dialog/PSPMsgDialog.h
View File

@ -36,9 +36,6 @@
#define SCE_UTILITY_MSGDIALOG_OPTION_SUPPORTED 0x000001B3 // OR of all options coded to display warning
#define SCE_UTILITY_MSGDIALOG_ERROR_BADOPTION 0x80110501
#define SCE_UTILITY_MSGDIALOG_ERROR_ERRORCODEINVALID 0x80110502
struct pspMessageDialog
{
pspUtilityDialogCommon common;

3
Core/HLE/ErrorCodes.h
View File

@ -309,6 +309,9 @@ enum : u32 {
SCE_ERROR_UTILITY_INVALID_SYSTEM_PARAM_ID = 0x80110103,
SCE_ERROR_UTILITY_INVALID_ADHOC_CHANNEL = 0x80110104,
SCE_ERROR_UTILITY_MSGDIALOG_BADOPTION = 0x80110501,
SCE_ERROR_UTILITY_MSGDIALOG_ERRORCODEINVALID = 0x80110502,
SCE_UTILITY_SAVEDATA_ERROR_TYPE = 0x80110300,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_MS = 0x80110301,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_EJECT_MS = 0x80110302,

3
Core/HLE/sceKernel.cpp
View File

@ -1326,6 +1326,9 @@ const char *KernelErrorToString(u32 err) {
case SCE_ERROR_UTILITY_INVALID_ADHOC_CHANNEL: return "UTILITY_INVALID_ADHOC_CHANNEL";
case SCE_ERROR_UTILITY_INVALID_SYSTEM_PARAM_ID: return "UTILITY_INVALID_SYSTEM_PARAM_ID";
case SCE_ERROR_UTILITY_MSGDIALOG_BADOPTION: return "UTILITY_MSGDIALOG_BADOPTION";
case SCE_ERROR_UTILITY_MSGDIALOG_ERRORCODEINVALID: return "UTILITY_MSGDIALOG_ERRORCODEINVALID";
case SCE_UTILITY_SAVEDATA_ERROR_TYPE: return "SAVEDATA_TYPE";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_MS: return "SAVEDATA_LOAD_NO_MS";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_EJECT_MS: return "SAVEDATA_LOAD_EJECT_MS";