From 0884b1fce8963d066436f97b7f4876faf96560d1 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Wed, 25 Jun 2008 10:21:02 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=BE=8C=E3=81=AB=E3=83=96=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=97=E3=81=9F=E3=82=A2=E3=83=97=E3=83=AA=E3=81=AE?= =?UTF-8?q?TitleID=E3=82=92TWL=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=81=AB=E4=BF=9D=E5=AD=98=E3=81=99?= =?UTF-8?q?=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92SYSM=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=AA=E3=81=8B=E3=82=89RED=E3=83=A9?= =?UTF-8?q?=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=E3=81=AB=E7=A7=BB=E5=8B=95?= =?UTF-8?q?=E3=80=82=20SDK=20rev.6791=E5=AF=BE=E5=BF=9C=E3=80=82ROM?= =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E6=A7=8B=E9=80=A0=E4=BD=93=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=80=82=EF=BC=88=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=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@1702 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../sysmenu/ARM9/src/title.c | 21 +++++++++---------- .../Launcher/ARM9/src/launcher.c | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 0a490091..73825ee9 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -314,10 +314,10 @@ 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->agree_EULA = SYSM_GetCardRomHeader()->exFlags.agree_EULA; + pTitleList_Card->availableSubBannerFile = SYSM_GetCardRomHeader()->exFlags.availableSubBannerFile; + pTitleList_Card->WiFiConnectionIcon = SYSM_GetCardRomHeader()->exFlags.WiFiConnectionIcon; + pTitleList_Card->DSWirelessIcon = SYSM_GetCardRomHeader()->exFlags.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; @@ -858,7 +858,7 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode, } // ヘッダのハッシュ計算 - SVC_CalcSHA1( s_calc_hash, header, (u32)( ( isTwlApp || ( pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_NAND ) || head->s.enable_nitro_whitelist_signature ) ? + SVC_CalcSHA1( s_calc_hash, header, (u32)( ( isTwlApp || ( pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_NAND ) || head->s.exFlags.enable_nitro_whitelist_signature ) ? TWL_ROM_HEADER_HASH_CALC_DATA_LEN : NTR_ROM_HEADER_HASH_CALC_DATA_LEN )); //この時点でヘッダの正当性検証 @@ -1756,7 +1756,6 @@ AuthResult SYSM_TryToBootTitle( TitleProperty *pBootTitle ) { u8 *pBuffer = SYSM_Alloc( LCFG_WRITE_TEMP ); if( pBuffer != NULL ) { - LCFG_TSD_SetLastTimeBootSoftTitleID ( pBootTitle->titleID ); LCFG_TSD_SetLastTimeBootSoftPlatform( (u8)SYSM_GetAppRomHeader()->platform_code ); (void)LCFG_WriteTWLSettings( (u8 (*)[ LCFG_WRITE_TEMP ] )pBuffer ); SYSM_Free( pBuffer ); @@ -1944,12 +1943,12 @@ 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->agree_EULA = hs->exFlags.agree_EULA; + info->availableSubBannerFile = hs->exFlags.availableSubBannerFile; + info->WiFiConnectionIcon = hs->exFlags.WiFiConnectionIcon; + info->DSWirelessIcon = hs->exFlags.DSWirelessIcon; info->platform_code = hs->platform_code; - MI_CpuCopy8( hs->parental_control_rating_info, info->parental_control_rating_info, 0x10); + MI_CpuCopy8( hs->parental_control_rating_info, info->parental_control_rating_info, PARENTAL_CONTROL_INFO_SIZE); info->card_region_bitmap = hs->card_region_bitmap; return TRUE; } diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c index f367216e..f68bee67 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c @@ -609,8 +609,9 @@ static TitleProperty *ProcessPads( TitleProperty *pTitleList ) { //PlayStream(&strm, filename); ret = &pTitleList[selected]; - // ブートするアプリのindex番号を本体設定に保存する。（実際の保存は、SYSMライブラリがブート時に行います。） + // ブートするアプリのindex番号とTitleIDを本体設定に保存する。（実際の保存は、SYSMライブラリがブート時に行います。） LCFG_TSD_SetLastTimeBootSoftIndex( (u8)selected ); + LCFG_TSD_SetLastTimeBootSoftTitleID ( pTitleList[selected].titleID ); } } }