rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

NANDアプリのアプリ種別がNTRであった場合のロードに対応

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@394 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2007-12-21 06:37:22 +00:00
parent a915f482e8
commit 00819663a3
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
View File

@ -517,7 +517,6 @@ BOOL SYSM_IsValidTSD( void )
// //
// ============================================================================ // ============================================================================
// TWLアプリのみ対応、NTRはまだ
static void SYSMi_LoadTitleThreadFunc( TitleProperty *pBootTitle ) static void SYSMi_LoadTitleThreadFunc( TitleProperty *pBootTitle )
{ {
enum enum
@ -539,6 +538,7 @@ static void SYSMi_LoadTitleThreadFunc( TitleProperty *pBootTitle )
char path[256]; char path[256];
FSFile file[1]; FSFile file[1];
BOOL bSuccess; BOOL bSuccess;
BOOL isTwlApp = TRUE;
NAM_GetTitleBootContentPath(path, pBootTitle->titleID); NAM_GetTitleBootContentPath(path, pBootTitle->titleID);
bSuccess = FS_OpenFileEx(file, path, FS_FILEMODE_R); bSuccess = FS_OpenFileEx(file, path, FS_FILEMODE_R);
@ -596,6 +596,7 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n");
if( header[0x12] && 0x03 == 0 ) if( header[0x12] && 0x03 == 0 )
{ {
//NTR専用ROM //NTR専用ROM
isTwlApp = FALSE;
} }
// 各領域を読み込む // 各領域を読み込む
@ -611,19 +612,23 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n");
length [region_arm7_ntr] = *(const u32*)&header[0x03C]; length [region_arm7_ntr] = *(const u32*)&header[0x03C];
destaddr[region_arm7_ntr] = *(const u32*)&header[0x038]; destaddr[region_arm7_ntr] = *(const u32*)&header[0x038];
source [region_arm9_twl] = *(const u32*)&header[0x1C0]; if( isTwlApp )
length [region_arm9_twl] = *(const u32*)&header[0x1CC]; {
destaddr[region_arm9_twl] = *(const u32*)&header[0x1C8]; source [region_arm9_twl] = *(const u32*)&header[0x1C0];
length [region_arm9_twl] = *(const u32*)&header[0x1CC];
source [region_arm7_twl] = *(const u32*)&header[0x1D0]; destaddr[region_arm9_twl] = *(const u32*)&header[0x1C8];
length [region_arm7_twl] = *(const u32*)&header[0x1DC];
destaddr[region_arm7_twl] = *(const u32*)&header[0x1D8]; source [region_arm7_twl] = *(const u32*)&header[0x1D0];
length [region_arm7_twl] = *(const u32*)&header[0x1DC];
destaddr[region_arm7_twl] = *(const u32*)&header[0x1D8];
}
// 領域読み込み先のチェック及び再配置情報データの作成 // 領域読み込み先のチェック及び再配置情報データの作成
for( i=0; i<RELOCATE_INFO_NUM; i++ ) for( i=0; i<RELOCATE_INFO_NUM; i++ )
{ {
if ( !isTwlApp && i >= ARM9_LTD_STATIC ) continue;// nitroでは読み込まない領域
if ( !SYSM_CheckLoadRegionAndSetRelocateInfo( (RomSegmentName)i, &(destaddr[i+region_arm9_ntr]), length[i+region_arm9_ntr], if ( !SYSM_CheckLoadRegionAndSetRelocateInfo( (RomSegmentName)i, &(destaddr[i+region_arm9_ntr]), length[i+region_arm9_ntr],
&(SYSMi_GetWork()->romRelocateInfo[i]), TRUE ) ) &(SYSMi_GetWork()->romRelocateInfo[i]), isTwlApp ) )
{ {
OS_TPrintf("RebootSystem failed: ROM Load Region error\n"); OS_TPrintf("RebootSystem failed: ROM Load Region error\n");
FS_CloseFile(file); FS_CloseFile(file);
@ -634,6 +639,8 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n");
for (i = region_header; i < region_max; ++i) for (i = region_header; i < region_max; ++i)
{ {
u32 len = length[i]; u32 len = length[i];
if ( !isTwlApp && i >= region_arm9_twl ) continue;// nitroでは読み込まない領域
bSuccess = FS_SeekFile(file, (s32)source[i], FS_SEEK_SET); bSuccess = FS_SeekFile(file, (s32)source[i], FS_SEEK_SET);