From 6dcce0037ca613771c7a06283b00a089f331f27a Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 25 Jun 2008 08:20:11 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=88=9D=E3=81=AB=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AB=E3=80=81=E3=83=98?=
 =?UTF-8?q?=E3=83=83=E3=83=80=E3=81=8B=E3=82=89=E5=8F=96=E5=BE=97=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=81=84=E3=82=8D=E3=81=84=E3=82=8D=E3=81=AA=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=82=92=E8=A9=B0=E3=82=81=E8=BE=BC=E3=82=80=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=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@1695 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/title.c                  | 26 ++++++++++++++++++-
 .../sysmenu/sysmenu_lib/common/sysmenu_api.h  | 16 ++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
index 5043cdf7..1586a22f 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
@@ -314,6 +314,13 @@ BOOL SYSM_GetCardTitleList( TitleProperty *pTitleList_Card )
 			pTitleList_Card->flags.isValid = TRUE;
 			pTitleList_Card->flags.isAppLoadCompleted = FALSE;
 			pTitleList_Card->flags.isAppRelocate = TRUE;
+			pTitleList_Card->agree_EULA = SYSM_GetCardRomHeader()->agree_EULA;
+			pTitleList_Card->availableSubBannerFile = SYSM_GetCardRomHeader()->availableSubBannerFile;
+			pTitleList_Card->WiFiConnectionIcon = SYSM_GetCardRomHeader()->WiFiConnectionIcon;
+			pTitleList_Card->DSWirelessIcon = SYSM_GetCardRomHeader()->DSWirelessIcon;
+			pTitleList_Card->platform_code = SYSM_GetCardRomHeader()->platform_code;
+			MI_CpuCopy8( SYSM_GetCardRomHeader()->parental_control_rating_info, pTitleList_Card->parental_control_rating_info, 0x10);
+			pTitleList_Card->card_region_bitmap = SYSM_GetCardRomHeader()->card_region_bitmap;
 		}
 		
 		// タイトル情報フラグのセット
@@ -429,7 +436,7 @@ static BOOL MakeTitleListMakerInfoFromTitleID( TitleListMakerInfo *info, OSTitle
 		int l;
 		NAMTitleInfo naminfo;
 		// この関数で得られる情報は無検証なので改ざんの可能性があるが、メーカーコードのみの判定なので、速度を優先する。(2008.06.20吉岡)
-		// （でもFastつけないと一回300msぐらいかかる）
+		// （Fastつけないと一回300msぐらいかかる）
 		NAM_ReadTitleInfoFast( &naminfo, titleID );
 		for(l=0;l<MAKER_CODE_MAX;l++)
 		{
@@ -520,7 +527,9 @@ int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand, int listNum )
 	// とりあえずALL
 	int l;
 	int validNum = 0;
+	
 	NAMTitleId titleIDArray[ LAUNCHER_TITLE_LIST_NUM - 1 ];// ローンチ可能なタイトルリストの一時置き場
+	static TitleListMakerInfo local_titleListMakerinfo[ LAUNCHER_TITLE_LIST_NUM - 1 ];// 苦肉の策
 	
 	if( s_pTitleIDList == NULL || s_pTitleListMakerInfo == NULL )
 	{
@@ -534,6 +543,7 @@ int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand, int listNum )
 		if( ( s_pTitleIDList[ l ] & ( TITLE_ID_NOT_LAUNCH_FLAG_MASK | TITLE_ID_DATA_ONLY_FLAG_MASK ) ) == 0 ) {
 			titleIDArray[ validNum ] = s_pTitleIDList[ l ];
 			BANNER_ReadBannerFromNAND( s_pTitleIDList[ l ], &s_bannerBuf[ validNum ], &s_pTitleListMakerInfo[l] );
+			local_titleListMakerinfo[validNum] = s_pTitleListMakerInfo[l];
 			validNum++;
 			if( !( validNum < LAUNCHER_TITLE_LIST_NUM - 1 ) )// 最大(LAUNCHER_TITLE_LIST_NUM - 1)まで
 			{
@@ -571,6 +581,13 @@ int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand, int listNum )
 		if( titleIDArray[l] ) {
 			pTitleList_Nand[l+1].flags.isValid = TRUE;
 			pTitleList_Nand[l+1].flags.bootType = LAUNCHER_BOOTTYPE_NAND;
+			pTitleList_Nand[l+1].agree_EULA = local_titleListMakerinfo[l].agree_EULA;
+			pTitleList_Nand[l+1].availableSubBannerFile = local_titleListMakerinfo[l].availableSubBannerFile;
+			pTitleList_Nand[l+1].WiFiConnectionIcon = local_titleListMakerinfo[l].WiFiConnectionIcon;
+			pTitleList_Nand[l+1].DSWirelessIcon = local_titleListMakerinfo[l].DSWirelessIcon;
+			pTitleList_Nand[l+1].platform_code = local_titleListMakerinfo[l].platform_code;
+			MI_CpuCopy8( local_titleListMakerinfo[l].parental_control_rating_info, pTitleList_Nand[l+1].parental_control_rating_info, 0x10);
+			pTitleList_Nand[l+1].card_region_bitmap = local_titleListMakerinfo[l].card_region_bitmap;
 		}
 	}
 	// return : *TitleProperty Array
@@ -1927,6 +1944,13 @@ BOOL SYSM_MakeTitleListMakerInfoFromHeader( TitleListMakerInfo *info, ROM_Header
 	info->public_save_data_size = hs->public_save_data_size;
 	info->private_save_data_size = hs->private_save_data_size;
 	info->permit_landing_normal_jump = ( hs->permit_landing_normal_jump ? TRUE : FALSE );
+	info->agree_EULA = hs->agree_EULA;
+	info->availableSubBannerFile = hs->availableSubBannerFile;
+	info->WiFiConnectionIcon = hs->WiFiConnectionIcon;
+	info->DSWirelessIcon = hs->DSWirelessIcon;
+	info->platform_code = hs->platform_code;
+	MI_CpuCopy8( hs->parental_control_rating_info, info->parental_control_rating_info, 0x10);
+	info->card_region_bitmap = hs->card_region_bitmap;
 	return TRUE;
 }
 
diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h
index 54e4d7e7..7a51f394 100644
--- a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h
+++ b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h
@@ -56,6 +56,14 @@ typedef struct TitleProperty {			// 
 	NAMTitleId			titleID;		// タイトルID（TitleID_Hiで起動メディアは判定できる？）
 	LauncherBootFlags	flags;			// ブート時のランチャー動作フラグ
 	TWLBannerFile		*pBanner;		// バナーへのポインタ（固定長フォーマットなら偽造されても大丈夫だろう。)
+	u8					agree_EULA:1;
+	u8					availableSubBannerFile:1;
+	u8					WiFiConnectionIcon:1;
+	u8					DSWirelessIcon:1;
+	u8					rsv:4;
+	char				platform_code;
+	u8					parental_control_rating_info[0x10];
+	u32					card_region_bitmap;
 }TitleProperty;
 
 // タイトルリスト作成用情報構造体
@@ -64,6 +72,14 @@ typedef struct TitleListMakerInfo {
 	u32					public_save_data_size;
 	u32					private_save_data_size;
 	BOOL				permit_landing_normal_jump;
+	u8					agree_EULA:1;
+	u8					availableSubBannerFile:1;
+	u8					WiFiConnectionIcon:1;
+	u8					DSWirelessIcon:1;
+	u8					rsv:4;
+	char				platform_code;
+	u8					parental_control_rating_info[0x10];
+	u32					card_region_bitmap;
 }TitleListMakerInfo;
 
 // アプリ認証結果