From e9c00251df34c3d0236a38bad0b357d05879aefa Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Tue, 1 Jul 2008 02:35:17 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=AE=E9=80=94=E4=B8=AD=E3=81=A7=E6=AD=BB=E3=82=93?= =?UTF-8?q?=E3=81=A0=E5=A0=B4=E5=90=88=E3=81=AB=E3=82=82=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E3=81=AB=E5=BF=9C=E3=81=98=E3=81=9FFATAL=E3=82=92=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1751 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/sysmenu/ARM9/src/title.c | 10 ++++++++++ build/systemMenu_RED/Launcher/ARM9/src/main.c | 10 +++++++++- include/sysmenu/util.h | 10 +++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 57b7431e..f83ea295 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -739,6 +739,7 @@ static void SYSMi_LoadTitleThreadFunc( TitleProperty *pBootTitle ) if( ! bSuccess ) { OS_TPrintf("RebootSystem failed: cant open file\n"); + UTL_SetFatalError(FATAL_ERROR_LOAD_OPENFILE_FAILED); goto ERROR; } @@ -769,6 +770,7 @@ OS_TPrintf("RebootSystem failed: cant open file\n"); if(!s_calc_hash) { OS_TPrintf("RebootSystem failed: Alloc Failed.\n"); + UTL_SetFatalError(FATAL_ERROR_LOAD_MEMALLOC_FAILED); goto ERROR; } @@ -784,6 +786,7 @@ OS_TPrintf("RebootSystem failed: Alloc Failed.\n"); if( ! bSuccess ) { OS_TPrintf("RebootSystem failed: cant seek file(0)\n"); + UTL_SetFatalError(FATAL_ERROR_LOAD_SEEKFILE_FAILED); goto ERROR; } @@ -803,6 +806,7 @@ OS_TPrintf("RebootSystem failed: cant seek file(0)\n"); if ( !result ) { OS_TPrintf("RebootSystem failed: cant read file(%d, %d)\n", 0, len); + UTL_SetFatalError(FATAL_ERROR_LOAD_READHEADER_FAILED); goto ERROR; } } @@ -819,6 +823,7 @@ OS_TPrintf("%02X ", header[i * 0x10 + j]); OS_TPrintf("\n"); } OS_TPrintf("RebootSystem failed: logo CRC error\n"); + UTL_SetFatalError(FATAL_ERROR_LOAD_LOGOCRC_ERROR); goto ERROR; } @@ -836,12 +841,14 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n"); if( ! bSuccess ) { OS_TPrintf("RebootSystem failed: cant seek file(0)\n"); + UTL_SetFatalError(FATAL_ERROR_LOAD_SEEKFILE_FAILED); goto ERROR; } readLen = FS_ReadFile(file, &s_authcode, (s32)sizeof(s_authcode)); if( readLen != (s32)sizeof(s_authcode) ) { OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode, 0, sizeof(s_authcode), readLen); + UTL_SetFatalError(FATAL_ERROR_LOAD_READDLSIGN_FAILED); goto ERROR; } } @@ -903,6 +910,7 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode, &(SYSMi_GetWork()->romRelocateInfo[i]), isTwlApp ) ) { OS_TPrintf("RebootSystem failed: ROM Load Region error\n"); + UTL_SetFatalError(FATAL_ERROR_LOAD_RELOCATEINFO_FAILED); goto ERROR; } } @@ -928,6 +936,7 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode, if( ! bSuccess ) { OS_TPrintf("RebootSystem failed: cant seek file(%d)\n", source[i]); + UTL_SetFatalError(FATAL_ERROR_LOAD_SEEKFILE_FAILED); goto ERROR; } @@ -984,6 +993,7 @@ OS_TPrintf("RebootSystem : Load VIA WRAM %d.\n", i); if ( !result ) { OS_TPrintf("RebootSystem failed: cant read file(%d, %d)\n", source[i], len); + UTL_SetFatalError(FATAL_ERROR_LOAD_READMODULE_FAILED); goto ERROR; } } diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index ad19bb96..d2c90856 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -92,7 +92,15 @@ static const char *fatal_error_msg[FATAL_ERROR_MAX] = "TWL_BOOTTYPE_UNKNOWN", "NTR_BOOTTYPE_UNKNOWN", "PLATFORM_UNKNOWN", - "LOAD_UNFINISHED" + "LOAD_UNFINISHED", + "LOAD_OPENFILE_FAILED", + "LOAD_MEMALLOC_FAILED", + "LOAD_SEEKFILE_FAILED", + "LOAD_READHEADER_FAILED", + "LOAD_LOGOCRC_ERROR", + "LOAD_READDLSIGN_FAILED", + "LOAD_RELOCATEINFO_FAILED", + "LOAD_READMODULE_FAILED" }; //#define DEBUG_LAUNCHER_DUMP diff --git a/include/sysmenu/util.h b/include/sysmenu/util.h index 51d6176c..e8470ab1 100644 --- a/include/sysmenu/util.h +++ b/include/sysmenu/util.h @@ -64,8 +64,16 @@ typedef enum FatalErrorCode { FATAL_ERROR_NTR_BOOTTYPE_UNKNOWN = 32, FATAL_ERROR_PLATFORM_UNKNOWN = 33, FATAL_ERROR_LOAD_UNFINISHED = 34, + FATAL_ERROR_LOAD_OPENFILE_FAILED = 35, + FATAL_ERROR_LOAD_MEMALLOC_FAILED = 36, + FATAL_ERROR_LOAD_SEEKFILE_FAILED = 37, + FATAL_ERROR_LOAD_READHEADER_FAILED = 38, + FATAL_ERROR_LOAD_LOGOCRC_ERROR = 39, + FATAL_ERROR_LOAD_READDLSIGN_FAILED = 40, + FATAL_ERROR_LOAD_RELOCATEINFO_FAILED = 41, + FATAL_ERROR_LOAD_READMODULE_FAILED = 42, - FATAL_ERROR_MAX = 35 + FATAL_ERROR_MAX = 43 }FatalErrorCode;