From 83ece203e0cd8b143768b4824f41bf40edc851bd Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Tue, 4 Dec 2007 02:35:45 +0000 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E9=85=8D=E7=BD=AE=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E9=96=A2=E9=80=A3=E3=81=AE=E4=BF=AE=E6=AD=A3=E7=89=88=E3=80=82?= =?UTF-8?q?=E3=81=82=E3=82=8B=E7=A8=8B=E5=BA=A6=E5=8B=95=E4=BD=9C=E7=A2=BA?= =?UTF-8?q?=E8=AA=8D=E3=81=8C=E3=81=A8=E3=82=8C=E3=81=9F=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E3=80=82=20=E3=83=BBROM?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=89=E4=BD=8D=E7=BD=AE=E3=81=8B=E3=82=89?= =?UTF-8?q?=E5=86=8D=E9=85=8D=E7=BD=AE=E6=83=85=E5=A0=B1=E3=81=AE=E8=87=AA?= =?UTF-8?q?=E5=8B=95=E8=A8=AD=E5=AE=9A=E3=82=92=E5=AE=9F=E8=A3=85=20?= =?UTF-8?q?=E3=83=BBpost=20clear=E3=81=AE=E3=83=AA=E3=82=B9=E3=83=88?= =?UTF-8?q?=E7=94=9F=E6=88=90=E3=81=AF=E6=9C=AA=E5=AE=9F=E8=A3=85=EF=BC=88?= =?UTF-8?q?=E8=80=83=E6=A1=88=E4=B8=AD=EF=BC=89?= 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@305 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 2 +- build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c index 6c778cbc..4c51a2d9 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c @@ -73,7 +73,7 @@ BOOL BOOT_WaitStart( void ) int list_count = PRE_CLEAR_NUM_MAX + 1; int l; // メモリリストの設定 - static u32 mem_list[PRE_CLEAR_NUM_MAX + 1 + COPY_NUM_MAX + 2 + POST_CLEAR_NUM_MAX] = + static u32 mem_list[PRE_CLEAR_NUM_MAX + 1 + COPY_NUM_MAX + 2 + POST_CLEAR_NUM_MAX + 1] = { // pre clear SYSM_OWN_ARM7_MMEM_ADDR, SYSM_OWN_ARM7_MMEM_ADDR_END - SYSM_OWN_ARM7_MMEM_ADDR, diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index 3b24a3c1..f6b2497f 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -560,7 +560,7 @@ static BOOL SYSMi_CheckLoadRegionAndSetRelocateInfoEx } // ここまで来ていれば再配置可能 - if( default_region.start <= *dest && default_region.end <= *dest + length ) + if( default_region.start <= *dest && *dest < default_region.end ) { // デフォルト配置領域の後部に、再配置先の先頭部が被っているので、後方コピーフラグON info->rev = TRUE; @@ -588,7 +588,7 @@ static BOOL SYSMi_CheckLoadRegionAndSetRelocateInfo( RomSegmentName seg, u32 *de static void SYSMi_LoadTitleThreadFunc( TitleProperty *pBootTitle ) { enum { - region_header, + region_header = 0, region_arm9_ntr, region_arm7_ntr, region_arm9_twl, @@ -683,7 +683,7 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n"); // 領域読み込み先のチェック及び再配置情報データの作成 for( i=0; iromRelocateInfo[i]) ) ) + if ( !SYSMi_CheckLoadRegionAndSetRelocateInfo( (RomSegmentName)i, &(destaddr[i+region_arm9_ntr]), length[i+region_arm9_ntr], &(SYSMi_GetWork()->romRelocateInfo[i]) ) ) { OS_TPrintf("RebootSystem failed: ROM Load Region error\n"); FS_CloseFile(file);