From 6f689282387597e0ea84dac1d81a0c6a887c8a77 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 13 May 2008 07:13:58 +0000
Subject: [PATCH] =?UTF-8?q?NTR=E6=9C=AC=E4=BD=93=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92=E3=82=B7=E3=82=B9=E3=83=86?=
 =?UTF-8?q?=E3=83=A0=E9=A0=98=E5=9F=9F=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F=E3=82=88=E3=81=86=E5=A4=89?=
 =?UTF-8?q?=E6=9B=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@1322 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index fd26fd9c..c207c3ee 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -169,7 +169,7 @@ TitleProperty *SYSM_ReadParameters( void )
 	    LCFG_VerifyAndRecoveryNTRSettings();  		                          	// NTR設定データを読み出して、TWL設定データとベリファイし、必要ならリカバリ
     }
 	
-    //-----------------------------------------------------
+	//-----------------------------------------------------
     // システム領域に本体設定などをコピー
     //-----------------------------------------------------
 	// NTRカードアプリARM9コードのロード領域とメモリがかち合うが、先頭0x4000はセキュア領域で別バッファに格納されるので、
@@ -304,6 +304,12 @@ static void SYSMi_CopyLCFGData( void )
 		LCFGTWLSettingsData *pSettings = (LCFGTWLSettingsData *)HW_PARAM_TWL_SETTINGS_DATA;
 		MI_CpuClear32( &pSettings->launcherStatus, sizeof(LCFGTWLLauncherStatus) );
 	}
+	
+	// NTR本体設定データをメモリに展開しておく
+	{
+		LCFG_NSD_SetLanguage( LCFG_NSD_GetLanguageEx() );
+		MI_CpuCopy8( LCFGi_GetNSD(), OS_GetSystemWork()->nvramUserInfo, sizeof(LCFGNTRSettingsData) );
+	}
 }