diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c index edb8f750..0315c254 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c @@ -148,6 +148,11 @@ BOOL BOOT_WaitStart( void ) OSi_GetFromFirmAddr()->aes_key[ 0 ] : (void *)dev_commonKey; MI_CpuCopy8( pCommonKey, (void *)HW_LAUNCHER_DELIVER_PARAM_BUF, AES_BLOCK_SIZE ); } + // commonClientKeyForDebugger + else if( th->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 ); + } + // HW AES Slot B if( th->s.access_control.hw_aes_slot_B ) { void *pSeedES = ( SCFG_GetBondingOption() == SCFG_OP_PRODUCT ) ? diff --git a/build/libraries_sysmenu/sysmenu/common/src/mountInfo.c b/build/libraries_sysmenu/sysmenu/common/src/mountInfo.c index 54db6b42..804efdd5 100644 --- a/build/libraries_sysmenu/sysmenu/common/src/mountInfo.c +++ b/build/libraries_sysmenu/sysmenu/common/src/mountInfo.c @@ -78,8 +78,15 @@ void SYSMi_SetLauncherMountInfo( void ) { NAMTitleId titleID = (( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF)->titleID; - // ※とりあえず自身はROMブートで。[TODO:]後で修正 -// SYSMi_SetBootSRLPath( LAUNCHER_BOOTTYPE_NAND, titleID ); // ※SDK2623では、BootSRLPathを"rom:"としたらFSi_InitRomArchiveでNANDアプリ扱いされてアクセス例外で落ちる。 + // bootSRLパスを設定(ランチャーが自分で設定するのは厄介なので、NANDファームからHW_TWL_FS_BOOT_SRL_PATH_BUF経由で + // 引き渡してもらう + { +#define BOOT_SRL_PATH_OFFSET 0x3c0 + u8 *pMountInfoAddr = ( ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF)->sub_mount_info_ram_address; + if( *(pMountInfoAddr + BOOT_SRL_PATH_OFFSET ) == 0 ) { + MI_CpuCopyFast( (void *)HW_TWL_FS_BOOT_SRL_PATH_BUF, pMountInfoAddr + BOOT_SRL_PATH_OFFSET, 0x40 ); + } + } // セーブデータ有無によるマウント情報の編集 // ※このタイミングではFSは動かせないので、FSを使わない特別版で対応。 diff --git a/docs/X4繝懊シ繝牙ッセ蠢/X4_TS繝懊シ繝画政霈峨Λ繝ウ繝√Ε繝シ貅門y.mmap b/docs/X4繝懊シ繝牙ッセ蠢/X4_TS繝懊シ繝画政霈峨Λ繝ウ繝√Ε繝シ貅門y.mmap index f6935b01..e5708858 100644 Binary files a/docs/X4繝懊シ繝牙ッセ蠢/X4_TS繝懊シ繝画政霈峨Λ繝ウ繝√Ε繝シ貅門y.mmap and b/docs/X4繝懊シ繝牙ッセ蠢/X4_TS繝懊シ繝画政霈峨Λ繝ウ繝√Ε繝シ貅門y.mmap differ diff --git a/docs/format_ROM_Header.xls b/docs/format_ROM_Header.xls index cd97eeeb..2c734452 100644 Binary files a/docs/format_ROM_Header.xls and b/docs/format_ROM_Header.xls differ diff --git a/docs/骰オ邂。逅.xls b/docs/骰オ邂。逅.xls index 14d23e0c..642e42d1 100644 Binary files a/docs/骰オ邂。逅.xls and b/docs/骰オ邂。逅.xls differ