From 3a8980990c4abe1ac28f40b0b5f71b98e8f59f99 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 4 Dec 2007 08:04:48 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E3=82=92?=
 =?UTF-8?q?=E7=B9=8B=E3=81=84=E3=81=A7=E3=81=84=E3=81=AA=E3=81=84=E3=81=A8?=
 =?UTF-8?q?=E3=80=81=E6=84=8F=E5=9B=B3=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8A?=
 =?UTF-8?q?=E3=82=8A=E3=81=AB=E5=8B=95=E3=81=8B=E3=81=AA=E3=81=84=E7=8A=B6?=
 =?UTF-8?q?=E6=85=8B=E3=81=A7=E3=81=82=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E3=80=81=E7=8F=BE=E7=8A=B6=E3=81=AEreboot=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=AA=E4=BB=95=E6=A7=98=E3=81=AB=E5=90=88?=
 =?UTF-8?q?=E3=82=8F=E3=81=9B=E3=81=A6=E6=9A=AB=E5=AE=9A=E5=87=A6=E7=BD=AE?=
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@307 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c  |  2 +-
 build/libraries_sysmenu/boot/ARM9/src/bootAPI.c  |  2 +-
 .../sysmenu/ARM9/src/sysmenu_lib.c               |  8 ++++++++
 .../systemMenu_RED/Launcher/ARM9/src/launcher.c  | 16 +++++++++++-----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index 1e297938..3fd3a2e5 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -132,7 +132,7 @@ BOOL BOOT_WaitStart( void )
 			mem_list[list_count] = NULL;
 
 			// リブート
-			OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x34), mem_list, REBOOT_TARGET_TWL_SYSTEM );
+			OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x34), mem_list, REBOOT_TARGET_TWL_SECURE_SYSTEM );
 		}
 	}
 	return FALSE;
diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
index 658487d9..42efcc04 100644
--- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
@@ -117,7 +117,7 @@ void BOOT_Ready( void )
 		};
 	    
 		// 起動するターゲットの種類を指定する必要あり
-	    OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x24), mem_list, REBOOT_TARGET_TWL_SYSTEM );
+	    OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x24), mem_list, REBOOT_TARGET_TWL_SECURE_SYSTEM );
 	}
 }
 
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index b3eda640..be01573c 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -607,6 +607,7 @@ static BOOL SYSMi_CheckLoadRegionAndSetRelocateInfoEx
 // SYSMi_CheckLoadRegionAndSetRelocateInfoExのラッパー関数
 static BOOL SYSMi_CheckLoadRegionAndSetRelocateInfo( RomSegmentName seg, u32 *dest, u32 length, Relocate_Info *info )
 {
+	// TWLにしか対応していないので注意。ヘッダを見てNTRならデフォルト配置領域を変更してやる必要あり。
 	return SYSMi_CheckLoadRegionAndSetRelocateInfoEx(dest, length, romSegmentRange[seg], load_region_check_list[seg], info);
 }
 
@@ -705,6 +706,13 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n");
         length  [region_arm7_twl] = *(const u32*)&header[0x1DC];
         destaddr[region_arm7_twl] = *(const u32*)&header[0x1D8];
         
+        if( header[0x12] && 0x03 == 0 )
+        {
+			//NTR専用ROM
+		}
+		
+		MI_CpuClearFast( (void *)SYSMi_GetWork()->romRelocateInfo, RELOCATE_INFO_NUM * sizeof(Relocate_Info) );
+        
         // 領域読み込み先のチェック及び再配置情報データの作成
 		for( i=0; i<RELOCATE_INFO_NUM; i++ )
 		{
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
index f8535fed..0f0b31c3 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -60,9 +60,10 @@
 #define MAX_SHOW_BANNER			6
 
 // フェードアウト関係
-#define FADE_COUNT_PER_ALPHA	(FADE_COUNT_MAX / ALPHA_MAX)
+#define FADE_COUNT_PER_ALPHA	((FADE_COUNT_MAX - FADE_START) / ALPHA_MAX)
 #define FADE_COUNT_MAX			124
 #define ALPHA_MAX				31
+#define FADE_START				62
 
 // extern data------------------------------------------
 
@@ -106,6 +107,7 @@ static u8 *pbanner_image_list[ LAUNCHER_TITLE_LIST_NUM ];
 static int banner_count = 0;
 static int selected = 0;
 static int bar_left = BAR_ZERO_X;
+static fx32 s_selected_banner_size;
 
 // const data  -----------------------------------------
 
@@ -245,7 +247,8 @@ static void SetAffineAnimation( int cursor )
 	static double wav;
 	if(cursor%FRAME_PER_SELECT == 0){			// 適当に波打たせてみる
 		double s = sin(wav);
-		mtx._00 = FX32_HALF - (long)( 0x80 * ( s - 1 ) );
+		s_selected_banner_size = FX32_HALF - (long)( 0x80 * ( s - 1 ) );
+		mtx._00 = s_selected_banner_size;
 		wav += 0.1;
 	}else{										// 適当に大きさを変えてみる
 		mtx._00 = FX32_HALF + FX32_HALF*(cursor%FRAME_PER_SELECT)/FRAME_PER_SELECT;
@@ -378,11 +381,11 @@ BOOL LauncherFadeout( TitleProperty *pTitleList )
 		MtxFx22 mtx;
 		static double wa;
 		double s = cos(wa);
-		if( s!=0 ) mtx._00 = (fx32)(FX32_HALF/s);
+		if( s!=0 ) mtx._00 = (fx32)((s_selected_banner_size/s) * (1.0 + wa/3));
 		else mtx._00 = 0x8fff;
 		mtx._01 = 0;
 		mtx._10 = 0;
-		mtx._11 = FX32_HALF;
+		mtx._11 = (fx32)(s_selected_banner_size * (1.0 + wa/3));
 		G2_SetOBJAffine((GXOamAffine *)(&banner_oam_attr[0]), &mtx);
 		wa += 0.1;
 	}
@@ -394,7 +397,10 @@ BOOL LauncherFadeout( TitleProperty *pTitleList )
 	GetAndDrawRTCData( &g_rtcDraw, FALSE );
 	
 	// フェードアウトのカウント処理
-	G2_ChangeBlendAlpha( fadecount/FADE_COUNT_PER_ALPHA, ALPHA_MAX-(fadecount/FADE_COUNT_PER_ALPHA) );
+	if(fadecount >= FADE_START)
+	{
+		G2_ChangeBlendAlpha( (fadecount-FADE_START)/FADE_COUNT_PER_ALPHA, ALPHA_MAX-((fadecount-FADE_START)/FADE_COUNT_PER_ALPHA) );
+	}
 	if(fadecount < FADE_COUNT_MAX) {
 		fadecount++;
 		return FALSE;