Merge pull request #19948 from hrydgard/more-error-code-work

Consolidate error codes into the big enum
hrydgard · Feb 4, 2025 · caf7b10 · caf7b10
2 parents 032b8bf + d1e5b45
commit caf7b10
Show file tree

Hide file tree

Showing 22 changed files with 565 additions and 470 deletions.
diff --git a/Core/Dialog/PSPDialog.cpp b/Core/Dialog/PSPDialog.cpp
@@ -36,6 +36,21 @@
 
 constexpr float FONT_SCALE = 0.55f;
 
+const char *UtilityDialogTypeToString(UtilityDialogType type) {
+	switch (type) {
+	case UtilityDialogType::NONE: return "NONE";
+	case UtilityDialogType::SAVEDATA: return "SAVEDATA";
+	case UtilityDialogType::MSG: return "MSG";
+	case UtilityDialogType::OSK: return "OSK";
+	case UtilityDialogType::NET: return "NET";
+	case UtilityDialogType::SCREENSHOT: return "SCREENSHOT";
+	case UtilityDialogType::GAMESHARING: return "GAMESHARING";
+	case UtilityDialogType::GAMEDATAINSTALL: return "GAMEDATAINSTALL";
+	case UtilityDialogType::NPSIGNIN: return "NPSIGNIN";
+	default: return "(unknown)";
+	}
+}
+
 void PSPDialog::InitCommon() {
 	UpdateCommon();
 

diff --git a/Core/Dialog/PSPDialog.h b/Core/Dialog/PSPDialog.h
@@ -29,12 +29,6 @@ class PointerWrap;
 #define SCE_UTILITY_DIALOG_RESULT_CANCEL       1
 #define SCE_UTILITY_DIALOG_RESULT_ABORT        2
 
-const int SCE_ERROR_UTILITY_INVALID_STATUS      = 0x80110001;
-const int SCE_ERROR_UTILITY_INVALID_PARAM_SIZE  = 0x80110004;
-const int SCE_ERROR_UTILITY_WRONG_TYPE          = 0x80110005;
-const int ERROR_UTILITY_INVALID_ADHOC_CHANNEL   = 0x80110104;
-const int ERROR_UTILITY_INVALID_SYSTEM_PARAM_ID = 0x80110103;
-
 struct pspUtilityDialogCommon
 {
 	u32_le size;            /** Size of the structure */
@@ -140,3 +134,5 @@ class PSPDialog {
 	UtilityDialogType dialogType_ = UtilityDialogType::NONE;
 	bool volatileLocked_ = false;
 };
+
+const char *UtilityDialogTypeToString(UtilityDialogType type);
diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp
@@ -40,10 +40,6 @@ const static u32 GAMEDATA_READS_PER_UPDATE = 20;
 
 const u32 PSP_UTILITY_GAMEDATA_MODE_SHOW_PROGRESS = 1;
 
-const u32 ERROR_UTILITY_GAMEDATA_MEMSTRICK_REMOVED = 0x80111901;
-const u32 ERROR_UTILITY_GAMEDATA_MEMSTRICK_WRITE_PROTECTED = 0x80111903;
-const u32 ERROR_UTILITY_GAMEDATA_INVALID_MODE = 0x80111908;
-
 static const std::string SFO_FILENAME = "PARAM.SFO";
 
 namespace
@@ -113,7 +109,7 @@ int PSPGamedataInstallDialog::Update(int animSpeed) {
 		return SCE_ERROR_UTILITY_INVALID_STATUS;
 
 	if (param->mode >= 2) {
-		param->common.result = ERROR_UTILITY_GAMEDATA_INVALID_MODE;
+		param->common.result = SCE_ERROR_UTILITY_GAMEDATA_INVALID_MODE;
 		param.NotifyWrite("DialogResult");
 		ChangeStatus(SCE_UTILITY_STATUS_FINISHED, 0);
 		WARN_LOG_REPORT(Log::sceUtility, "sceUtilityGamedataInstallUpdate: invalid mode %d", param->mode);

diff --git a/Core/Dialog/PSPGamedataInstallDialog.h b/Core/Dialog/PSPGamedataInstallDialog.h
@@ -19,6 +19,7 @@
 
 #include "Core/Dialog/PSPDialog.h"
 #include "Core/Dialog/SavedataParam.h"
+#include "Core/HLE/ErrorCodes.h"
 
 struct SceUtilityGamedataInstallParam {
 	pspUtilityDialogCommon common;

diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp
@@ -16,12 +16,14 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <algorithm>
+
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"
 #include "Core/Dialog/PSPMsgDialog.h"
 #include "Core/Dialog/PSPSaveDialog.h"
 #include "Core/Util/PPGeDraw.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceCtrl.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"
@@ -74,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)
 	{
@@ -84,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)
@@ -93,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;
 		}
 	}
 

diff --git a/Core/Dialog/PSPMsgDialog.h b/Core/Dialog/PSPMsgDialog.h
@@ -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;

diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp
@@ -20,6 +20,7 @@
 #include <cctype>
 #include <cmath>
 #include <algorithm>
+
 #include "Common/Data/Text/I18n.h"
 #include "Common/Math/math_util.h"
 #include "Common/Data/Encoding/Utf8.h"
@@ -30,6 +31,7 @@
 #include "Core/Dialog/PSPOskDialog.h"
 #include "Core/Util/PPGeDraw.h"
 #include "Core/HLE/sceCtrl.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HLE/sceUtility.h"
 #include "Core/HW/Display.h"
 #include "Core/Config.h"

diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp
@@ -31,6 +31,7 @@
 #include "Core/Util/PPGeDraw.h"
 #include "Core/HLE/sceCtrl.h"
 #include "Core/HLE/sceUtility.h"
+#include "Core/HLE/ErrorCodes.h"
 #include "Core/HW/MemoryStick.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Config.h"

diff --git a/Core/Dialog/PSPSaveDialog.h b/Core/Dialog/PSPSaveDialog.h
@@ -23,52 +23,6 @@
 #include "Core/Dialog/PSPDialog.h"
 #include "Core/Dialog/SavedataParam.h"
 
-#define SCE_UTILITY_SAVEDATA_ERROR_TYPE                 (0x80110300)
-
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_MS           (0x80110301)
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_EJECT_MS        (0x80110302)
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_ACCESS_ERROR    (0x80110305)
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_DATA_BROKEN     (0x80110306)
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_DATA         (0x80110307)
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_PARAM           (0x80110308)
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_FILE_NOT_FOUND  (0x80110309)
-#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_INTERNAL        (0x8011030b)
-
-#define SCE_UTILITY_SAVEDATA_ERROR_RW_NO_MEMSTICK       (0x80110321)
-#define SCE_UTILITY_SAVEDATA_ERROR_RW_MEMSTICK_FULL     (0x80110323)
-#define SCE_UTILITY_SAVEDATA_ERROR_RW_DATA_BROKEN       (0x80110326)
-#define SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA           (0x80110327)
-#define SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_PARAMS        (0x80110328)
-#define SCE_UTILITY_SAVEDATA_ERROR_RW_FILE_NOT_FOUND    (0x80110329)
-#define SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_STATUS        (0x8011032c)
-
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_MS           (0x80110381)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_EJECT_MS        (0x80110382)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_NOSPACE      (0x80110383)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_PROTECTED    (0x80110384)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_ACCESS_ERROR    (0x80110385)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_PARAM           (0x80110388)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_UMD          (0x80110389)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_WRONG_UMD       (0x8011038a)
-#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_INTERNAL        (0x8011038b)
-
-#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_MS         (0x80110341)
-#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_EJECT_MS      (0x80110342)
-#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_MS_PROTECTED  (0x80110344)
-#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_ACCESS_ERROR  (0x80110345)
-#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_DATA       (0x80110347)
-#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_PARAM         (0x80110348)
-#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_INTERNAL      (0x8011034b)
-
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_MS          (0x801103C1)
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_EJECT_MS       (0x801103C2)
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_ACCESS_ERROR   (0x801103C5)
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_DATA        (0x801103C7)
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_PARAM          (0x801103C8)
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_UMD         (0x801103C9)
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_WRONG_UMD      (0x801103Ca)
-#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_INTERNAL       (0x801103Cb)
-
 class PSPSaveDialog : public PSPDialog {
 public:
 	PSPSaveDialog(UtilityDialogType type);

diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp
@@ -1623,7 +1623,7 @@ int SavedataParam::SetPspParam(SceUtilitySavedataParam *param)
 				if (!found) {  // NOTE: May be changed above, can't merge with the expression
 					if (listEmptyFile) {
 						ClearFileInfo(saveDataList[realCount], thisSaveName);
-						INFO_LOG(Log::sceUtility, "Listing missing save data: %s = %s", thisSaveName.c_str(), fileDataDir.c_str());
+						DEBUG_LOG(Log::sceUtility, "Listing missing save data: %s = %s", thisSaveName.c_str(), fileDataDir.c_str());
 						realCount++;
 					} else {
 						INFO_LOG(Log::sceUtility, "Save data not found: %s = %s", thisSaveName.c_str(), fileDataDir.c_str());
@@ -1651,7 +1651,7 @@ int SavedataParam::SetPspParam(SceUtilitySavedataParam *param)
 		} else {
 			if (listEmptyFile) {
 				ClearFileInfo(saveDataList[0], GetSaveName(param));
-				INFO_LOG(Log::sceUtility, "Listing missing save data: %s = %s", GetSaveName(param).c_str(), fileDataDir.c_str());
+				DEBUG_LOG(Log::sceUtility, "Listing missing save data: %s = %s", GetSaveName(param).c_str(), fileDataDir.c_str());
 			} else {
 				INFO_LOG(Log::sceUtility, "Save data not found: %s = %s", GetSaveName(param).c_str(), fileDataDir.c_str());
 			}