From ece1e59e6d29d32dc885474f339c518285e57626 Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Wed, 9 Jan 2008 08:04:18 +0000 Subject: [PATCH] =?UTF-8?q?Relocate=5FInfo=E3=82=92SDK=E3=81=AElauncherPar?= =?UTF-8?q?am.h=E3=81=B8=E7=A7=BB=E5=8B=95=E3=81=97=E3=81=9F=E9=96=A2?= =?UTF-8?q?=E4=BF=82=E3=81=A7=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@448 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c | 2 +- .../ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c | 2 +- include/sysmenu/reloc_info/common/reloc_info.h | 11 ----------- include/sysmenu/sysmenu_lib/common/sysmenu_work.h | 2 -- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index e4b3fa08..c8cdf371 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -699,7 +699,7 @@ void SYSM_StartLoadTitle( TitleProperty *pBootTitle ) }else if(pBootTitle->flags.isAppLoadCompleted) { // カードブートでなく、ロード済みの場合、再配置情報をランチャーパラメタから読み込み - MI_CpuCopy8( SYSM_GetLauncherParamBody()->v1.relocInfoBuf, SYSMi_GetWork()->romRelocateInfo, sizeof(Relocate_Info)*RELOCATE_INFO_NUM ); + MI_CpuCopy8( SYSM_GetLauncherParamBody()->v1.relocInfo, SYSMi_GetWork()->romRelocateInfo, sizeof(Relocate_Info)*RELOCATE_INFO_NUM ); // 更にヘッダを再配置 if( ((ROM_Header_Short *)(0x27e0000 - 0x4000))->platform_code & PLATFORM_CODE_FLAG_TWL ) { // TWL-ROMヘッダ情報の再配置 diff --git a/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c index a1a36361..450a688f 100644 --- a/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c +++ b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c @@ -387,7 +387,7 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n"); if ( !isTwlApp && i >= ARM9_LTD_STATIC ) continue;// nitroでは読み込まない領域 // 再配置情報のランチャーパラメタへの受け渡し処理。暫定的な実装。SDKに機能として組み込んでしまうか検討中。 if ( !EPLAi_CheckLoadRegionAndSetRelocateInfo( (RomSegmentName)i, &(destaddr[i+region_arm9_ntr]), length[i+region_arm9_ntr], - (Relocate_Info *)&(EPLAi_GetLauncherParamAddr()->body.v1.relocInfoBuf[24 * i]), isTwlApp ) ) + &EPLAi_GetLauncherParamAddr()->body.v1.relocInfo[i], isTwlApp ) ) { OS_TPrintf("RebootSystem failed: ROM Load Region error\n"); FS_CloseFile(file); diff --git a/include/sysmenu/reloc_info/common/reloc_info.h b/include/sysmenu/reloc_info/common/reloc_info.h index 51b062a4..2e8a17a5 100644 --- a/include/sysmenu/reloc_info/common/reloc_info.h +++ b/include/sysmenu/reloc_info/common/reloc_info.h @@ -26,17 +26,6 @@ extern "C" { //　データ型定義 //---------------------------------------------------------------------- -// 再配置情報データ構造体 -typedef struct Relocate_Info -{ - u32 src; - u32 dest; - u32 length; - u32 post_clear_addr; - u32 post_clear_length; - BOOL rev; -}Relocate_Info; - // ROMセグメント名 typedef enum RomSegmentName { ARM9_STATIC = 0, diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h index 98bad295..b691a39e 100644 --- a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h +++ b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h @@ -36,8 +36,6 @@ extern "C" { #define CLONE_BOOT_MODE 1 #define OTHER_BOOT_MODE 2 -#define RELOCATE_INFO_NUM 4 // ROM再配置情報の数（今のところarm9,arm7それぞれltdとflxで最大4つ） - // NAMTitleIDをHiLoに分割してアクセスする場合に使用 typedef struct TitleID_HiLo {