From 07841a79813ca61fce9416da9fc17ae09b11aaa3 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 30 Apr 2008 06:35:26 +0000
Subject: [PATCH] =?UTF-8?q?NAND=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0?=
 =?UTF-8?q?=E3=81=A7=E3=81=AEAES=E7=A8=AE=E3=82=BB=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=81=AE=E8=AA=BF=E6=95=B4=E3=80=82?=
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@1277 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/components/hyena.TWL/src/main.c                | 7 ++-----
 build/libraries_sysmenu/sysmenu/ARM7/src/setAESKey.c | 2 +-
 build/nandfirm/menu-launcher/ARM7/main.c             | 5 +++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c
index c5380345..e7fc674a 100644
--- a/build/components/hyena.TWL/src/main.c
+++ b/build/components/hyena.TWL/src/main.c
@@ -182,11 +182,8 @@ TwlSpMain(void)
 #ifndef SDK_NOCRYPTO
         AES_Init();           // AES 初期化
 
-		if( SCFG_IsCPUJtagEnable() ) {
-			MI_CpuCopyFast( (void *)HW_LAUNCHER_DELIVER_PARAM_BUF, (void *)SDK_SEA_KEY_STORE, HW_LAUNCHER_DELIVER_PARAM_BUF_SIZE );
-		}else {
-			SYSMi_SetAESKeysForAccessControlCore( (ROM_Header *)HW_TWL_ROM_HEADER_BUF, (u8 *)SDK_SEA_KEY_STORE, NULL, NULL );
-		}
+		// NANDファームがHW_LAUNCHER_DELIVER_PARAM_BUFへのAES_SEEDセットを行ってくれるので、ISデバッガ接続に関係なくSDK_SEA_KEY_STOREへのコピーを行えばよい
+		MI_CpuCopyFast( (void *)HW_LAUNCHER_DELIVER_PARAM_BUF, (void *)SDK_SEA_KEY_STORE, HW_LAUNCHER_DELIVER_PARAM_BUF_SIZE );
 		
 #ifdef SDK_SEA
         SEA_Init();
diff --git a/build/libraries_sysmenu/sysmenu/ARM7/src/setAESKey.c b/build/libraries_sysmenu/sysmenu/ARM7/src/setAESKey.c
index 3b486725..365c0772 100644
--- a/build/libraries_sysmenu/sysmenu/ARM7/src/setAESKey.c
+++ b/build/libraries_sysmenu/sysmenu/ARM7/src/setAESKey.c
@@ -99,7 +99,7 @@ void SYSMi_SetAESKeysForAccessControlCore( ROM_Header *pROMH, u8 *pDst, BOOL *pI
 	}
 	// commonClientKeyForDebugger
 	else if( pROMH->s.access_control.common_client_key_for_debugger_sysmenu ) {
-		MI_CpuCopy8( OSi_GetFromFirmAddr()->aes_key[ 1 ], (void *)HW_LAUNCHER_DELIVER_PARAM_BUF, AES_BLOCK_SIZE );
+		MI_CpuCopy8( OSi_GetFromFirmAddr()->aes_key[ 1 ], pDst, AES_BLOCK_SIZE );
 	}
 	
 	// HW AES Slot B
diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c
index a6a7f8f9..b9ced7fd 100644
--- a/build/nandfirm/menu-launcher/ARM7/main.c
+++ b/build/nandfirm/menu-launcher/ARM7/main.c
@@ -38,7 +38,8 @@
 /*
     AES鍵設定API
 */
-extern void SYSMi_SetAESKeysForAccessControl( BOOL isNtrMode, ROM_Header *pROMH );
+extern void SYSMi_SetAESKeysForAccessControlCore( ROM_Header *pROMH, u8 *pDst, BOOL *pIsClearSlotB, BOOL *pIsClearSlotC );
+
 
 #ifdef PROFILE_ENABLE
 #define PROFILE_MAX  16
@@ -315,7 +316,7 @@ void TwlSpMain( void )
 
 //    PM_BackLightOn( TRUE ); // last chance
 
-    SYSMi_SetAESKeysForAccessControl(FALSE, rh);
+	SYSMi_SetAESKeysForAccessControlCore( (ROM_Header *)HW_TWL_ROM_HEADER_BUF, (u8 *)HW_LAUNCHER_DELIVER_PARAM_BUF, NULL, NULL );
     OS_BootFromFIRM();
 
 end: