Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Consolidate even more error codes

Browse source
This commit is contained in:
Henrik Rydgård 2025-02-04 12:30:30 -06:00
parent a18eb97be3
commit d2c1c7b54f
5 changed files with 93 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Core/Dialog/PSPGamedataInstallDialog.cpp
View file

@ -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);

1
Core/Dialog/PSPSaveDialog.cpp
View file

@ -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"

46
Core/Dialog/PSPSaveDialog.h
View file

@ -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);

46
Core/HLE/ErrorCodes.h
View file

@ -301,6 +301,7 @@ enum : u32 {
SCE_ERROR_MODULE_ALREADY_LOADED = 0x80111102,
SCE_ERROR_MODULE_NOT_LOADED = 0x80111103,
SCE_ERROR_AV_MODULE_BAD_ID = 0x80110F01,
SCE_ERROR_UTILITY_INVALID_STATUS = 0x80110001,
SCE_ERROR_UTILITY_INVALID_PARAM_SIZE = 0x80110004,
SCE_ERROR_UTILITY_WRONG_TYPE = 0x80110005,
@ -308,6 +309,51 @@ enum : u32 {
SCE_ERROR_UTILITY_INVALID_SYSTEM_PARAM_ID = 0x80110103,
SCE_ERROR_UTILITY_INVALID_ADHOC_CHANNEL = 0x80110104,
SCE_UTILITY_SAVEDATA_ERROR_TYPE = 0x80110300,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_MS = 0x80110301,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_EJECT_MS = 0x80110302,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_ACCESS_ERROR = 0x80110305,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_DATA_BROKEN = 0x80110306,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_DATA = 0x80110307,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_PARAM = 0x80110308,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_FILE_NOT_FOUND = 0x80110309,
SCE_UTILITY_SAVEDATA_ERROR_LOAD_INTERNAL = 0x8011030b,
SCE_UTILITY_SAVEDATA_ERROR_RW_NO_MEMSTICK = 0x80110321,
SCE_UTILITY_SAVEDATA_ERROR_RW_MEMSTICK_FULL = 0x80110323,
SCE_UTILITY_SAVEDATA_ERROR_RW_DATA_BROKEN = 0x80110326,
SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA = 0x80110327,
SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_PARAMS = 0x80110328,
SCE_UTILITY_SAVEDATA_ERROR_RW_FILE_NOT_FOUND = 0x80110329,
SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_STATUS = 0x8011032c,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_MS = 0x80110381,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_EJECT_MS = 0x80110382,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_NOSPACE = 0x80110383,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_PROTECTED = 0x80110384,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_ACCESS_ERROR = 0x80110385,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_PARAM = 0x80110388,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_UMD = 0x80110389,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_WRONG_UMD = 0x8011038a,
SCE_UTILITY_SAVEDATA_ERROR_SAVE_INTERNAL = 0x8011038b,
SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_MS = 0x80110341,
SCE_UTILITY_SAVEDATA_ERROR_DELETE_EJECT_MS = 0x80110342,
SCE_UTILITY_SAVEDATA_ERROR_DELETE_MS_PROTECTED = 0x80110344,
SCE_UTILITY_SAVEDATA_ERROR_DELETE_ACCESS_ERROR = 0x80110345,
SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_DATA = 0x80110347,
SCE_UTILITY_SAVEDATA_ERROR_DELETE_PARAM = 0x80110348,
SCE_UTILITY_SAVEDATA_ERROR_DELETE_INTERNAL = 0x8011034b,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_MS = 0x801103C1,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_EJECT_MS = 0x801103C2,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_ACCESS_ERROR = 0x801103C5,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_DATA = 0x801103C7,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_PARAM = 0x801103C8,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_UMD = 0x801103C9,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_WRONG_UMD = 0x801103Ca,
SCE_UTILITY_SAVEDATA_ERROR_SIZES_INTERNAL = 0x801103Cb,
SCE_ERROR_UTILITY_GAMEDATA_MEMSTICK_REMOVED = 0x80111901,
SCE_ERROR_UTILITY_GAMEDATA_MEMSTICK_WRITE_PROTECTED = 0x80111903,
SCE_ERROR_UTILITY_GAMEDATA_INVALID_MODE = 0x80111908,
SCE_ERROR_AUDIO_CHANNEL_NOT_INIT = 0x80260001,
SCE_ERROR_AUDIO_CHANNEL_BUSY = 0x80260002,
SCE_ERROR_AUDIO_INVALID_CHANNEL = 0x80260003,

45
Core/HLE/sceKernel.cpp
View file

@ -1326,6 +1326,51 @@ 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_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";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_ACCESS_ERROR: return "SAVEDATA_LOAD_ACCESS_ERROR";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_DATA_BROKEN: return "SAVEDATA_LOAD_DATA_BROKEN";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_DATA: return "SAVEDATA_LOAD_NO_DATA";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_PARAM: return "SAVEDATA_LOAD_PARAM";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_FILE_NOT_FOUND: return "SAVEDATA_LOAD_FILE_NOT_FOUND";
case SCE_UTILITY_SAVEDATA_ERROR_LOAD_INTERNAL: return "SAVEDATA_LOAD_INTERNAL";
case SCE_UTILITY_SAVEDATA_ERROR_RW_NO_MEMSTICK: return "SAVEDATA_RW_NO_MEMSTICK";
case SCE_UTILITY_SAVEDATA_ERROR_RW_MEMSTICK_FULL: return "SAVEDATA_RW_MEMSTICK_FULL";
case SCE_UTILITY_SAVEDATA_ERROR_RW_DATA_BROKEN: return "SAVEDATA_RW_DATA_BROKEN";
case SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA: return "SAVEDATA_RW_NO_DATA";
case SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_PARAMS: return "SAVEDATA_RW_BAD_PARAMS";
case SCE_UTILITY_SAVEDATA_ERROR_RW_FILE_NOT_FOUND: return "SAVEDATA_RW_FILE_NOT_FOUND";
case SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_STATUS: return "SAVEDATA_RW_BAD_STATUS";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_MS: return "SAVEDATA_SAVE_NO_MS";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_EJECT_MS: return "SAVEDATA_SAVE_EJECT_MS";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_NOSPACE: return "SAVEDATA_SAVE_MS_NOSPACE";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_PROTECTED: return "SAVEDATA_SAVE_MS_PROTECTED";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_ACCESS_ERROR: return "SAVEDATA_SAVE_ACCESS_ERROR";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_PARAM: return "SAVEDATA_SAVE_PARAM";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_UMD: return "SAVEDATA_SAVE_NO_UMD";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_WRONG_UMD: return "SAVEDATA_SAVE_WRONG_UMD";
case SCE_UTILITY_SAVEDATA_ERROR_SAVE_INTERNAL: return "SAVEDATA_SAVE_INTERNAL";
case SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_MS: return "SAVEDATA_DELETE_NO_MS";
case SCE_UTILITY_SAVEDATA_ERROR_DELETE_EJECT_MS: return "SAVEDATA_DELETE_EJECT_MS";
case SCE_UTILITY_SAVEDATA_ERROR_DELETE_MS_PROTECTED: return "SAVEDATA_DELETE_MS_PROTECTED";
case SCE_UTILITY_SAVEDATA_ERROR_DELETE_ACCESS_ERROR: return "SAVEDATA_DELETE_ACCESS_ERROR";
case SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_DATA: return "SAVEDATA_DELETE_NO_DATA";
case SCE_UTILITY_SAVEDATA_ERROR_DELETE_PARAM: return "SAVEDATA_DELETE_PARAM";
case SCE_UTILITY_SAVEDATA_ERROR_DELETE_INTERNAL: return "SAVEDATA_DELETE_INTERNAL";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_MS: return "SAVEDATA_SIZES_NO_MS";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_EJECT_MS: return "SAVEDATA_SIZES_EJECT_MS";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_ACCESS_ERROR: return "SAVEDATA_SIZES_ACCESS_ERROR";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_DATA: return "SAVEDATA_SIZES_NO_DATA";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_PARAM: return "SAVEDATA_SIZES_PARAM";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_UMD: return "SAVEDATA_SIZES_NO_UMD";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_WRONG_UMD: return "SAVEDATA_SIZES_WRONG_UMD";
case SCE_UTILITY_SAVEDATA_ERROR_SIZES_INTERNAL: return "SAVEDATA_SIZES_INTERNAL";
case SCE_ERROR_UTILITY_GAMEDATA_MEMSTICK_REMOVED: return "UTILITY_GAMEDATA_MEMSTICK_REMOVED";
case SCE_ERROR_UTILITY_GAMEDATA_MEMSTICK_WRITE_PROTECTED: return "UTILITY_GAMEDATA_MEMSTICK_WRITE_PROTECTED";
case SCE_ERROR_UTILITY_GAMEDATA_INVALID_MODE: return "UTILITY_GAMEDATA_INVALID_MODE";
case SCE_ERROR_AUDIO_CHANNEL_NOT_INIT: return "AUDIO_CHANNEL_NOT_INIT";
case SCE_ERROR_AUDIO_CHANNEL_BUSY: return "AUDIO_CHANNEL_BUSY";
case SCE_ERROR_AUDIO_INVALID_CHANNEL: return "AUDIO_INVALID_CHANNEL";