From e7c996dffc9800bd92abb39b08ead394e3fffb2a Mon Sep 17 00:00:00 2001 From: yutaka Date: Wed, 19 Mar 2008 11:36:21 +0000 Subject: [PATCH] =?UTF-8?q?TwlSDK=E3=81=AEFC=E5=AF=BE=E5=BF=9C(=E9=80=94?= =?UTF-8?q?=E4=B8=AD=E3=81=BE=E3=81=A7)?= 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@912 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/gcdfirm/sdmc-launcher/ARM7/main.c | 3 + build/gcdfirm/sdmc-launcher/ARM9/main.c | 48 +++++----- build/libraries/fs/ARM7/src/fs_firm.c | 111 +++++++++++++++++++---- build/libraries/fs/ARM9/src/fs_firm.c | 9 +- build/libraries/fs/ARM9/src/fs_loader.c | 12 ++- build/nandfirm/menu-launcher/ARM7/main.c | 4 +- build/nandfirm/menu-launcher/ARM9/main.c | 33 +++---- build/nandfirm/sdmc-launcher/ARM7/main.c | 3 + build/nandfirm/sdmc-launcher/ARM9/main.c | 50 +++++----- include/firm/fs/ARM7/fs_firm.h | 23 +++++ include/firm/fs/ARM9/fs_firm.h | 4 +- include/firm/fs/ARM9/fs_loader.h | 8 +- include/firm/hw/ARM7/mmap_firm.h | 11 +++ include/firm/hw/common/mmap_firm.h | 6 +- 14 files changed, 213 insertions(+), 112 deletions(-) diff --git a/build/gcdfirm/sdmc-launcher/ARM7/main.c b/build/gcdfirm/sdmc-launcher/ARM7/main.c index b1c11891..20ad55eb 100644 --- a/build/gcdfirm/sdmc-launcher/ARM7/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM7/main.c @@ -149,6 +149,8 @@ static void PostInit(void) PM_InitFIRM(); // AESの初期化 AES_Init(); // for encrypted NAND + // マウント情報の初期化 + FS_InitMountInfo(FALSE, TRUE); // アイドルスレッドの作成 CreateIdleThread(); /* @@ -320,6 +322,7 @@ void TwlSpMain( void ) AESi_ResetAesKeyB(); AESi_ResetAesKeyC(); MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) ); + FS_SetMountInfoForSrl(); OS_BootFromFIRM(); end: diff --git a/build/gcdfirm/sdmc-launcher/ARM9/main.c b/build/gcdfirm/sdmc-launcher/ARM9/main.c index 2d3f29b7..9d16e6ca 100644 --- a/build/gcdfirm/sdmc-launcher/ARM9/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM9/main.c @@ -16,12 +16,10 @@ *---------------------------------------------------------------------------*/ #include -#define RSA_KEY1_ADDR rsa_key1 -#define RSA_KEY2_ADDR rsa_key2 - #ifndef FIRM_USE_TWLSDK_KEYS -static const u8* rsa_key1 = NULL; // not acceptable -static const u8 rsa_key2[128] = +static const u8* rsa_key_user = NULL; // not acceptable +static const u8* rsa_key_sys = NULL; // not acceptable +static const u8 rsa_key_secure[128] = { 0xC7, 0x94, 0x50, 0x00, 0x3A, 0xE1, 0x0E, 0x6C, 0xA8, 0xD1, 0xC0, 0x2D, 0x77, 0xB7, 0x6D, 0xBC, 0x31, 0xDB, 0x12, 0x08, 0x09, 0x0D, 0x2A, 0xE8, 0xC9, 0x1A, 0x2B, 0x6E, 0x6C, 0x85, 0x78, 0xD7, @@ -33,7 +31,7 @@ static const u8 rsa_key2[128] = 0x27, 0x75, 0x2B, 0x04, 0xD7, 0x26, 0xA8, 0x8A, 0x55, 0x2A, 0x76, 0xE5, 0x68, 0x80, 0x57, 0x85 }; #else -static const u8 rsa_key1[128] = +static const u8 rsa_key_user[128] = { 0xAC, 0x93, 0xBB, 0x3C, 0x15, 0x5C, 0x5F, 0x25, 0xB0, 0x4C, 0x37, 0xA4, 0x2D, 0x85, 0x29, 0x1D, 0x7A, 0x9D, 0x2D, @@ -45,7 +43,7 @@ static const u8 rsa_key1[128] = 0x62, 0x39, 0xFB, 0x10, 0x7E, 0x48, 0x7F, 0xDD, 0x82, 0x38, 0x38, 0x76, 0xB5, 0xCE, 0x21, 0x4B, 0xC9, 0x6F, 0x31, 0x8D, 0x23, 0x57, 0x3D, 0xB6, 0x6C, 0xEE, 0xC2, 0x0D, 0x11 }; -static const u8 rsa_key2[128] = +static const u8 rsa_key_sys[128] = { 0xe9, 0x9e, 0xa7, 0x9f, 0x59, 0x4d, 0xf4, 0xa7, 0x60, 0x04, 0xbd, 0x47, 0xf2, 0xb3, 0x64, 0xcd, 0x16, 0x79, 0xc1, 0x47, 0x39, 0xf6, 0xa9, 0xf8, 0xee, 0x1a, 0xd0, 0x72, 0xcf, 0x43, 0x97, 0x0c, @@ -56,6 +54,17 @@ static const u8 rsa_key2[128] = 0x01, 0xbb, 0x58, 0x93, 0xea, 0xa0, 0x2c, 0xc7, 0x7d, 0x6a, 0x31, 0x7e, 0xc9, 0xe2, 0xda, 0xfe, 0x1f, 0x2e, 0x9d, 0xa7, 0x54, 0x84, 0xdc, 0x28, 0xb9, 0x18, 0xea, 0x16, 0xf2, 0x95, 0x55, 0x6d, }; +static const u8 rsa_key_secure[128] = +{ + 0xa7, 0x9f, 0x54, 0xa0, 0xc7, 0x45, 0xae, 0xf6, 0x63, 0xa7, 0x53, 0xb7, 0x0a, 0xcc, 0x0b, 0xcb, + 0x65, 0xe1, 0x11, 0xc6, 0x05, 0x15, 0xb5, 0x6e, 0xbd, 0xac, 0x0c, 0xca, 0xf4, 0x7c, 0x68, 0x7a, + 0xf9, 0x0e, 0x5d, 0x98, 0x5b, 0xc8, 0x4d, 0x22, 0x3b, 0xa3, 0xbe, 0x8b, 0x5b, 0x7f, 0x26, 0x44, + 0x9f, 0xc4, 0x48, 0x44, 0xb1, 0x32, 0xb7, 0xbe, 0x63, 0xba, 0xd6, 0xc1, 0x10, 0xce, 0xf6, 0xed, + 0x47, 0x8f, 0xe1, 0xff, 0x7f, 0x5a, 0xd5, 0x5d, 0x94, 0x38, 0x2f, 0xa1, 0xd4, 0xef, 0x82, 0xb1, + 0x0d, 0xc4, 0x43, 0xec, 0xbe, 0x77, 0xb6, 0x82, 0x9c, 0xfa, 0x17, 0x87, 0x84, 0x82, 0x25, 0x46, + 0xfb, 0xd6, 0x05, 0xc8, 0x9a, 0x7e, 0xad, 0x44, 0x40, 0x0d, 0x35, 0x9c, 0x45, 0x44, 0x64, 0x36, + 0x61, 0x4b, 0xf7, 0xe6, 0x31, 0x5c, 0x7d, 0x96, 0x73, 0xe8, 0xac, 0xb4, 0xe3, 0x5e, 0xd1, 0x9d, +}; #endif #define RSA_HEAP_SIZE (4*1024) // RSA用ヒープサイズ (サイズ調整必要) @@ -105,28 +114,15 @@ static char* debugPtr = (char*)PRINT_MEMORY_ADDR; ***************************************************************/ static void PreInit(void) { - static const OSMountInfo firmSettings[] = - { - // drive device target pertitionIdx resource userPermission rsvA B archive path - { 'A', OS_MOUNT_DEVICE_SD, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "sdmc", "/" }, - { 'B', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand", "/" }, // ユーザーアプリはこのアーカイブではWrite不可 - { 'C', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 1, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand2", "/" }, // ユーザーアプリはこのアーカイブではWrite不可 - { 'D', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "shared2", "nand2:/shared2" }, - { 'E', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "photo", "nand2:/photo" }, - { 0 } - }; /* メインメモリ関連 */ // SHARED領域クリア - MI_CpuClearFast((void *)HW_WRAM_EX_LOCK_BUF, (HW_WRAM_EX_LOCK_BUF_END - HW_WRAM_EX_LOCK_BUF)); - MI_CpuClearFast((void *)HW_BIOS_EXCP_STACK_MAIN, (HW_REAL_TIME_CLOCK_BUF - HW_BIOS_EXCP_STACK_MAIN)); - MI_CpuClearFast((void *)HW_PXI_SIGNAL_PARAM_ARM9, (HW_MMEMCHECKER_MAIN - HW_PXI_SIGNAL_PARAM_ARM9)); + MI_CpuClearFast((void*)HW_WRAM_EX_LOCK_BUF, (HW_WRAM_EX_LOCK_BUF_END - HW_WRAM_EX_LOCK_BUF)); + MI_CpuClearFast((void*)HW_BIOS_EXCP_STACK_MAIN, (HW_REAL_TIME_CLOCK_BUF - HW_BIOS_EXCP_STACK_MAIN)); + MI_CpuClearFast((void*)HW_PXI_SIGNAL_PARAM_ARM9, (HW_MMEMCHECKER_MAIN - HW_PXI_SIGNAL_PARAM_ARM9)); MI_CpuClearFast((void*)HW_ROM_HEADER_BUF, (HW_ROM_HEADER_BUF_END-HW_ROM_HEADER_BUF)); - // FS_MOUNT領域の初期化 - MI_CpuCopy8(firmSettings, (char*)HW_TWL_FS_MOUNT_INFO_BUF, sizeof(firmSettings)); - /* FromBrom関連 */ @@ -159,7 +155,7 @@ static void PostInit(void) ***************************************************************/ static BOOL CheckHeader(void) { - static ROM_Header_Short* const rhs = (ROM_Header_Short*)HW_TWL_ROM_HEADER_BUF; + ROM_Header_Short* const rhs = (ROM_Header_Short*)HW_TWL_ROM_HEADER_BUF; // イニシャルコードなど OS_TPrintf("Initial Code : %08X (%.4s)\n", *(u32*)rhs->game_code, rhs->game_code); OS_TPrintf("Platform Code : %02X\n", rhs->platform_code); @@ -264,7 +260,7 @@ void TwlMain( void ) // 3: after PostInit PUSH_PROFILE(); - STD_CopyString((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, MENU_FILE); + STD_CopyString((char*)HW_FIRM_TEMP_SRL_PATH_BUF, MENU_FILE); // 4: after STD_CopyString PUSH_PROFILE(); @@ -272,7 +268,7 @@ void TwlMain( void ) // 5: after PXI PUSH_PROFILE(); - if ( !FS_LoadHeader( &acPool, RSA_KEY1_ADDR, RSA_KEY2_ADDR ) || !CheckHeader() ) + if ( !FS_LoadHeader( &acPool, rsa_key_user, rsa_key_sys, rsa_key_secure ) || !CheckHeader() ) { OS_TPrintf("Failed to call FS_LoadHeader() and/or CheckHeader().\n"); goto end; diff --git a/build/libraries/fs/ARM7/src/fs_firm.c b/build/libraries/fs/ARM7/src/fs_firm.c index 261ff699..57d0e01b 100644 --- a/build/libraries/fs/ARM7/src/fs_firm.c +++ b/build/libraries/fs/ARM7/src/fs_firm.c @@ -19,20 +19,6 @@ #include #include -//#define WORKAROUND_NAND_2KB_BUG - -#define FS_HEADER_AUTH_SIZE 0xe00 - -#define MODULE_ALIGNMENT 0x10 // 16バイト単位で読み込む -//#define MODULE_ALIGNMENT 0x200 // 512バイト単位で読み込む -#define RoundUpModuleSize(value) (((value) + MODULE_ALIGNMENT - 1) & -MODULE_ALIGNMENT) - -static ROM_Header* const rh= (ROM_Header*)HW_TWL_ROM_HEADER_BUF; - -static BOOL aesFlag; -static AESCounter aesCounter; -static u8 aesBuffer[HW_FIRM_LOAD_BUFFER_UNIT_SIZE] ATTRIBUTE_ALIGN(32); - static void ConvertPath( u16* dest, const char* src, u32 max) { dest[0] = 0; @@ -50,7 +36,7 @@ static void ConvertPath( u16* dest, const char* src, u32 max) } // ドライブ名の解決 - for (info = OS_GetMountInfo(); *info->drive; ++info) + for (info = (void*)HW_FIRM_MOUNT_INFO_BUF; *info->drive; ++info) { if ((STD_CompareNString(src, info->archiveName, len) == 0) && (info->archiveName[len] == 0)) @@ -99,10 +85,97 @@ static void ConvertPath( u16* dest, const char* src, u32 max) } } +/*---------------------------------------------------------------------------* + Name: FS_InitMountInfo + + Description: set mount info for firm + + Arguments: nand TRUE if set nand entry + sdmc TRUE if set sdmc entry + + Returns: None + *---------------------------------------------------------------------------*/ +void FS_InitMountInfo( BOOL nand, BOOL sdmc ) +{ + const OSMountInfo nandSetting = { 'A', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand", "/" }; + const OSMountInfo sdmcSetting = { 'B', OS_MOUNT_DEVICE_SD, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "sdmc", "/" }; + OSMountInfo* dest = (OSMountInfo*)HW_FIRM_MOUNT_INFO_BUF; + + if ( nand ) + { + MI_CpuCopy8(&nandSetting, dest++, sizeof(OSMountInfo)); + } + if ( sdmc ) + { + MI_CpuCopy8(&sdmcSetting, dest++, sizeof(OSMountInfo)); + } + if ( dest < (void*)HW_FIRM_BOOT_SRL_PATH_BUF ) + { + *(u32*)dest = 0; + } + *(u8*)HW_TWL_RED_LAUNCHER_VER = 1; + STD_CopyString( "nand:/sys/HWINFO_S.dat", (void*)HW_FIRM_BOOT_SRL_PATH_BUF ); // dummy for firm +} + +/*---------------------------------------------------------------------------* + Name: FS_SetMountInfoForSrl + + Description: set mount info for srl file + + Arguments: None + + Returns: None + *---------------------------------------------------------------------------*/ +void FS_SetMountInfoForSrl( void ) +{ + const OSMountInfo defaultMountList[] ATTRIBUTE_ALIGN(4) = { + // drive device target pertitionIdx resource userPermission rsvA B archive path + { 'A', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, 0, 0, 0, "nand", "/" }, // ユーザーアプリはこのアーカイブではR/W不可 + { 'B', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 1, OS_MOUNT_RSC_WRAM, 0, 0, 0, "nand2", "/" }, // ユーザーアプリはこのアーカイブではR/W不可 + { 'C', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R), 0, 0, "content", NULL }, // Write不可 + { 'D', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R), 0, 0, "shared1", "nand:/shared1" }, // Write不可 + { 'E', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "shared2", "nand:/shared2" }, + { 'F', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 1, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "photo", "nand2:/photo" }, + { 'G', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_FILE, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "dataPrv", NULL }, // NANDにセーブデータがないアプリの場合は、マウントされない。 + { 'H', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_FILE, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "dataPub", NULL }, // NANDにセーブデータがないアプリの場合は、マウントされない。 + { 'I', OS_MOUNT_DEVICE_SD, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "sdmc", "/" }, + }; +#define NAND_MOUNT_INDEX 0 +#define NAND2_MOUNT_INDEX 1 +#define CONTENT_MOUNT_INDEX 2 + const ROM_Header_Short* const rhs = HW_TWL_ROM_HEADER_BUF; + OSMountInfo* const dest = (OSMountInfo*)HW_FIRM_MOUNT_INFO_BUF; + + MI_CpuCopy8(defaultMountList, dest, sizeof(defaultMountList)); + // nandアプリならパスを追加 + if ( *(char*)HW_FIRM_BOOT_SRL_PATH_BUF ) + { + const char* lastpath = STD_SearchCharReverse( (char*)HW_FIRM_BOOT_SRL_PATH_BUF, '/' ); + if (lastpath && *(char*)(lastpath-1) != ':') + { + u32 len = (u32)(lastpath - (char*)HW_FIRM_BOOT_SRL_PATH_BUF); + if (len > OS_MOUNT_PATH_LEN) + { + len = OS_MOUNT_PATH_LEN; + } + MI_CpuCopy8((char*)HW_FIRM_BOOT_SRL_PATH_BUF, dest[CONTENT_MOUNT_INDEX].path, len); + if (len != OS_MOUNT_PATH_LEN) + { + ((char*)HW_FIRM_BOOT_SRL_PATH_BUF)[len] = 0; + } + } + } + // secureアプリならアクセス許可 + if ( rhs->titleID_Hi & TITLE_ID_HI_SECURE_FLAG_MASK ) + { + dest[NAND_MOUNT_INDEX].userPermission = dest[NAND2_MOUNT_INDEX].userPermission = (OS_MOUNT_USR_R|OS_MOUNT_USR_W); + } +} + /*---------------------------------------------------------------------------* Name: FS_OpenSrl - Description: open srl file named in HW_TWL_FS_BOOT_SRL_PATH_BUF + Description: open srl file named via HW_FIRM_TEMP_SRL_PATH_BUF Arguments: None @@ -110,8 +183,8 @@ static void ConvertPath( u16* dest, const char* src, u32 max) *---------------------------------------------------------------------------*/ int FS_OpenSrl( void ) { - const char *fspath = (char*)HW_TWL_FS_BOOT_SRL_PATH_BUF; - u16 fatpath[OS_MOUNT_PATH_LEN]; - ConvertPath(fatpath, fspath, OS_MOUNT_PATH_LEN); + u16 fatpath[HW_FIRM_BOOT_SRL_PATH_BUF_SIZE]; + MI_CpuCopyFast((void*)HW_FIRM_TEMP_SRL_PATH_BUF, (void*)HW_FIRM_BOOT_SRL_PATH_BUF, HW_FIRM_BOOT_SRL_PATH_BUF_SIZE); + ConvertPath(fatpath, (void*)HW_FIRM_BOOT_SRL_PATH_BUF, HW_FIRM_BOOT_SRL_PATH_BUF_SIZE); return FATFSi_rtfs_po_open((u8*)fatpath, 0, 0); } diff --git a/build/libraries/fs/ARM9/src/fs_firm.c b/build/libraries/fs/ARM9/src/fs_firm.c index edcbbc06..5fb6021f 100644 --- a/build/libraries/fs/ARM9/src/fs_firm.c +++ b/build/libraries/fs/ARM9/src/fs_firm.c @@ -34,7 +34,6 @@ *---------------------------------------------------------------------------*/ void FS_InitFIRM( void ) { - MI_CpuClearFast( (void*)HW_FIRM_FS_TEMP_BUFFER, HW_FIRM_FS_TEMP_BUFFER_SIZE ); FSiTemporaryBuffer = (void*)HW_FIRM_FS_TEMP_BUFFER; FATFS_InitFIRM(); FS_Init( FS_DMA_NOT_USE ); @@ -176,7 +175,7 @@ BOOL FS_GetTitleBootContentPathFast(char* buf, OSTitleId titleId) /*---------------------------------------------------------------------------* Name: FS_ResolveSrl - Description: resolve srl filename and store to HW_TWL_FS_BOOT_SRL_PATH_BUF + Description: resolve srl filename and store to HW_FIRM_TEMP_SRL_PATH_BUF Arguments: titleId title id for srl file @@ -185,7 +184,7 @@ BOOL FS_GetTitleBootContentPathFast(char* buf, OSTitleId titleId) BOOL FS_ResolveSrl( OSTitleId titleId ) { if ( ES_ERR_OK != ES_InitLib() || - ES_ERR_OK != ES_GetContentPath(titleId, CONTENT_INDEX_BOOT, (char*)HW_TWL_FS_BOOT_SRL_PATH_BUF) || + ES_ERR_OK != ES_GetContentPath(titleId, CONTENT_INDEX_BOOT, (char*)HW_FIRM_TEMP_SRL_PATH_BUF) || ES_ERR_OK != ES_CloseLib() ) { return FALSE; @@ -196,7 +195,7 @@ BOOL FS_ResolveSrl( OSTitleId titleId ) /*---------------------------------------------------------------------------* Name: FS_ResolveSrlUnsecured - Description: resolve srl filename and store to HW_TWL_FS_BOOT_SRL_PATH_BUF + Description: resolve srl filename and store to HW_FIRM_TEMP_SRL_PATH_BUF without almost security check Arguments: titleId title id for srl file @@ -205,7 +204,7 @@ BOOL FS_ResolveSrl( OSTitleId titleId ) *---------------------------------------------------------------------------*/ BOOL FS_ResolveSrlUnsecured( OSTitleId titleId ) { - if ( !FS_GetTitleBootContentPathFast((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, titleId) ) + if ( !FS_GetTitleBootContentPathFast((char*)HW_FIRM_TEMP_SRL_PATH_BUF, titleId) ) { return FALSE; } diff --git a/build/libraries/fs/ARM9/src/fs_loader.c b/build/libraries/fs/ARM9/src/fs_loader.c index 7063f3db..072130c4 100644 --- a/build/libraries/fs/ARM9/src/fs_loader.c +++ b/build/libraries/fs/ARM9/src/fs_loader.c @@ -287,13 +287,13 @@ BOOL FS_LoadModule( u8* dest, u32 offset, u32 size, const u8 digest[SVC_SHA1_DIG and verify signature Arguments: pool heap context to call SVC_DecryptSign - rsa_key1 public key to verify the signature - rsa_key2 public key to verify the signature - for system applications + rsa_key_user public key to verify the signature for user application + rsa_key_sys public key to verify the signature for system application + rsa_key_secure public key to verify the signature for secure application Returns: TRUE if success *---------------------------------------------------------------------------*/ -BOOL FS_LoadHeader( SVCSignHeapContext* pool, const void* rsa_key1, const void* rsa_key2 ) +BOOL FS_LoadHeader( SVCSignHeapContext* pool, const void* rsa_key_user, const void* rsa_key_sys, const void* rsa_key_secure ) { #ifndef NO_SECURITY_CHECK const void* rsa_key; @@ -313,7 +313,9 @@ BOOL FS_LoadHeader( SVCSignHeapContext* pool, const void* rsa_key1, const void* } // 鍵の確定 - rsa_key = (rh->s.titleID_Hi & 0x1) ? rsa_key2 : rsa_key1; + rsa_key = (rh->s.titleID_Hi & TITLE_ID_HI_SECURE_FLAG_MASK) + ? rsa_key_secure + : ( (rh->s.titleID_Hi & TITLE_ID_HI_APP_TYPE_MASK) ? rsa_key_sys : rsa_key_user ); #ifdef SUPPORT_CERTIFICATION // コンテンツ証明書 if ( CheckRomCertificate( pool, &rh->certificate, rsa_key, *(u32*)rh->s.game_code ) ) diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c index 51feb04d..90ecfc8b 100644 --- a/build/nandfirm/menu-launcher/ARM7/main.c +++ b/build/nandfirm/menu-launcher/ARM7/main.c @@ -33,7 +33,7 @@ PRINT_MEMORY_ADDR を定義すると、そのアドレスからSPrintfを行います(このファイルのみ) FINALROM版でもコードが残るので注意してください。 */ -#define PRINT_MEMORY_ADDR 0x02FFC800 +//#define PRINT_MEMORY_ADDR 0x02FFC800 #ifdef PROFILE_ENABLE @@ -149,6 +149,8 @@ static void PostInit(void) PM_InitFIRM(); // AESの初期化 AES_Init(); // for encrypted NAND + // マウント情報の初期化 + FS_InitMountInfo(TRUE, FALSE); // アイドルスレッドの作成 CreateIdleThread(); /* diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c index 5fbe5214..a95215ba 100644 --- a/build/nandfirm/menu-launcher/ARM9/main.c +++ b/build/nandfirm/menu-launcher/ARM9/main.c @@ -21,16 +21,16 @@ #define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[0] // 鍵管理.xls参照 #else #define RSA_KEY_ADDR rsa_key -static const u8 rsa_key[128] = +static const u8 rsa_key_launcher[128] = { - 0xe9, 0x9e, 0xa7, 0x9f, 0x59, 0x4d, 0xf4, 0xa7, 0x60, 0x04, 0xbd, 0x47, 0xf2, 0xb3, 0x64, 0xcd, - 0x16, 0x79, 0xc1, 0x47, 0x39, 0xf6, 0xa9, 0xf8, 0xee, 0x1a, 0xd0, 0x72, 0xcf, 0x43, 0x97, 0x0c, - 0x93, 0xa1, 0x38, 0x4e, 0x13, 0x40, 0x6c, 0x10, 0x59, 0x43, 0xe2, 0x71, 0x29, 0x54, 0x14, 0x2c, - 0xc5, 0xda, 0x59, 0x4d, 0xb4, 0x6a, 0xef, 0x85, 0x61, 0x6f, 0x7f, 0x1c, 0x59, 0x34, 0x2c, 0xc6, - 0x24, 0xf3, 0x7b, 0xc3, 0xb7, 0x40, 0xd1, 0x46, 0xf8, 0x90, 0xb7, 0xc2, 0x98, 0x50, 0xaf, 0x95, - 0x52, 0x42, 0xdb, 0xac, 0xd6, 0x7e, 0xa9, 0xc3, 0x3d, 0x1b, 0x51, 0x56, 0x07, 0x06, 0xd0, 0x0b, - 0x01, 0xbb, 0x58, 0x93, 0xea, 0xa0, 0x2c, 0xc7, 0x7d, 0x6a, 0x31, 0x7e, 0xc9, 0xe2, 0xda, 0xfe, - 0x1f, 0x2e, 0x9d, 0xa7, 0x54, 0x84, 0xdc, 0x28, 0xb9, 0x18, 0xea, 0x16, 0xf2, 0x95, 0x55, 0x6d, + 0xa7, 0x9f, 0x54, 0xa0, 0xc7, 0x45, 0xae, 0xf6, 0x63, 0xa7, 0x53, 0xb7, 0x0a, 0xcc, 0x0b, 0xcb, + 0x65, 0xe1, 0x11, 0xc6, 0x05, 0x15, 0xb5, 0x6e, 0xbd, 0xac, 0x0c, 0xca, 0xf4, 0x7c, 0x68, 0x7a, + 0xf9, 0x0e, 0x5d, 0x98, 0x5b, 0xc8, 0x4d, 0x22, 0x3b, 0xa3, 0xbe, 0x8b, 0x5b, 0x7f, 0x26, 0x44, + 0x9f, 0xc4, 0x48, 0x44, 0xb1, 0x32, 0xb7, 0xbe, 0x63, 0xba, 0xd6, 0xc1, 0x10, 0xce, 0xf6, 0xed, + 0x47, 0x8f, 0xe1, 0xff, 0x7f, 0x5a, 0xd5, 0x5d, 0x94, 0x38, 0x2f, 0xa1, 0xd4, 0xef, 0x82, 0xb1, + 0x0d, 0xc4, 0x43, 0xec, 0xbe, 0x77, 0xb6, 0x82, 0x9c, 0xfa, 0x17, 0x87, 0x84, 0x82, 0x25, 0x46, + 0xfb, 0xd6, 0x05, 0xc8, 0x9a, 0x7e, 0xad, 0x44, 0x40, 0x0d, 0x35, 0x9c, 0x45, 0x44, 0x64, 0x36, + 0x61, 0x4b, 0xf7, 0xe6, 0x31, 0x5c, 0x7d, 0x96, 0x73, 0xe8, 0xac, 0xb4, 0xe3, 0x5e, 0xd1, 0x9d, }; #endif @@ -54,7 +54,7 @@ static SVCSignHeapContext acPool; PRINT_MEMORY_ADDR を定義すると、そのアドレスからSPrintfを行います(このファイルのみ) FINALROM版でもコードが残るので注意してください。 */ -#define PRINT_MEMORY_ADDR 0x02FFC200 +//#define PRINT_MEMORY_ADDR 0x02FFC200 //#ifdef SDK_FINALROM // FINALROMで無効化 //#undef PROFILE_ENABLE @@ -83,19 +83,12 @@ static char* debugPtr = (char*)PRINT_MEMORY_ADDR; ***************************************************************/ static void PreInit(void) { - static const OSMountInfo firmSettings[] = - { - { 'F', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand", "/" }, - { 0 } - }; + ROM_Header_Short* const rhs = (ROM_Header_Short*)HW_TWL_ROM_HEADER_BUF; /* メインメモリ関連 */ // SHARED領域はスタートアップ時でクリア - // FS_MOUNT領域の初期化 - MI_CpuCopy8(firmSettings, (char*)HW_TWL_FS_MOUNT_INFO_BUF, sizeof(firmSettings)); - /* FromBrom関連 */ @@ -169,7 +162,7 @@ static BOOL RetryResolveSrl(void) ***************************************************************/ static BOOL CheckHeader(void) { - static ROM_Header_Short* const rhs = (ROM_Header_Short*)HW_TWL_ROM_HEADER_BUF; + ROM_Header_Short* const rhs = (ROM_Header_Short*)HW_TWL_ROM_HEADER_BUF; // イニシャルコードなど OS_TPrintf("Initial Code : %08X (%.4s)\n", *(u32*)rhs->game_code, rhs->game_code); OS_TPrintf("Platform Code : %02X\n", rhs->platform_code); @@ -279,7 +272,7 @@ void TwlMain( void ) // 6: after PXI PUSH_PROFILE(); - if ( !FS_LoadHeader( &acPool, NULL, RSA_KEY_ADDR ) || !CheckHeader() ) + if ( !FS_LoadHeader( &acPool, NULL, NULL, rsa_key_launcher ) || !CheckHeader() ) { OS_TPrintf("Failed to call FS_LoadHeader() and/or CheckHeader().\n"); goto end; diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c index e694d6f0..b3e04b15 100644 --- a/build/nandfirm/sdmc-launcher/ARM7/main.c +++ b/build/nandfirm/sdmc-launcher/ARM7/main.c @@ -149,6 +149,8 @@ static void PostInit(void) PM_InitFIRM(); // AESの初期化 AES_Init(); // for encrypted NAND + // マウント情報の初期化 + FS_InitMountInfo(FALSE, TRUE); // アイドルスレッドの作成 CreateIdleThread(); /* @@ -320,6 +322,7 @@ void TwlSpMain( void ) AESi_ResetAesKeyB(); AESi_ResetAesKeyC(); MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) ); + FS_SetMountInfoForSrl(); OS_BootFromFIRM(); end: diff --git a/build/nandfirm/sdmc-launcher/ARM9/main.c b/build/nandfirm/sdmc-launcher/ARM9/main.c index 367836df..5eee2385 100644 --- a/build/nandfirm/sdmc-launcher/ARM9/main.c +++ b/build/nandfirm/sdmc-launcher/ARM9/main.c @@ -16,12 +16,10 @@ *---------------------------------------------------------------------------*/ #include -#define RSA_KEY1_ADDR rsa_key1 -#define RSA_KEY2_ADDR rsa_key2 - #ifndef FIRM_USE_TWLSDK_KEYS -static const u8* rsa_key1 = NULL; // not acceptable -static const u8 rsa_key2[128] = +static const u8* rsa_key_user = NULL; // not acceptable +static const u8* rsa_key_sys = NULL; // not acceptable +static const u8 rsa_key_secure[128] = { 0xC7, 0x94, 0x50, 0x00, 0x3A, 0xE1, 0x0E, 0x6C, 0xA8, 0xD1, 0xC0, 0x2D, 0x77, 0xB7, 0x6D, 0xBC, 0x31, 0xDB, 0x12, 0x08, 0x09, 0x0D, 0x2A, 0xE8, 0xC9, 0x1A, 0x2B, 0x6E, 0x6C, 0x85, 0x78, 0xD7, @@ -33,7 +31,7 @@ static const u8 rsa_key2[128] = 0x27, 0x75, 0x2B, 0x04, 0xD7, 0x26, 0xA8, 0x8A, 0x55, 0x2A, 0x76, 0xE5, 0x68, 0x80, 0x57, 0x85 }; #else -static const u8 rsa_key1[128] = +static const u8 rsa_key_user[128] = { 0xAC, 0x93, 0xBB, 0x3C, 0x15, 0x5C, 0x5F, 0x25, 0xB0, 0x4C, 0x37, 0xA4, 0x2D, 0x85, 0x29, 0x1D, 0x7A, 0x9D, 0x2D, @@ -45,7 +43,7 @@ static const u8 rsa_key1[128] = 0x62, 0x39, 0xFB, 0x10, 0x7E, 0x48, 0x7F, 0xDD, 0x82, 0x38, 0x38, 0x76, 0xB5, 0xCE, 0x21, 0x4B, 0xC9, 0x6F, 0x31, 0x8D, 0x23, 0x57, 0x3D, 0xB6, 0x6C, 0xEE, 0xC2, 0x0D, 0x11 }; -static const u8 rsa_key2[128] = +static const u8 rsa_key_sys[128] = { 0xe9, 0x9e, 0xa7, 0x9f, 0x59, 0x4d, 0xf4, 0xa7, 0x60, 0x04, 0xbd, 0x47, 0xf2, 0xb3, 0x64, 0xcd, 0x16, 0x79, 0xc1, 0x47, 0x39, 0xf6, 0xa9, 0xf8, 0xee, 0x1a, 0xd0, 0x72, 0xcf, 0x43, 0x97, 0x0c, @@ -56,6 +54,17 @@ static const u8 rsa_key2[128] = 0x01, 0xbb, 0x58, 0x93, 0xea, 0xa0, 0x2c, 0xc7, 0x7d, 0x6a, 0x31, 0x7e, 0xc9, 0xe2, 0xda, 0xfe, 0x1f, 0x2e, 0x9d, 0xa7, 0x54, 0x84, 0xdc, 0x28, 0xb9, 0x18, 0xea, 0x16, 0xf2, 0x95, 0x55, 0x6d, }; +static const u8 rsa_key_secure[128] = +{ + 0xa7, 0x9f, 0x54, 0xa0, 0xc7, 0x45, 0xae, 0xf6, 0x63, 0xa7, 0x53, 0xb7, 0x0a, 0xcc, 0x0b, 0xcb, + 0x65, 0xe1, 0x11, 0xc6, 0x05, 0x15, 0xb5, 0x6e, 0xbd, 0xac, 0x0c, 0xca, 0xf4, 0x7c, 0x68, 0x7a, + 0xf9, 0x0e, 0x5d, 0x98, 0x5b, 0xc8, 0x4d, 0x22, 0x3b, 0xa3, 0xbe, 0x8b, 0x5b, 0x7f, 0x26, 0x44, + 0x9f, 0xc4, 0x48, 0x44, 0xb1, 0x32, 0xb7, 0xbe, 0x63, 0xba, 0xd6, 0xc1, 0x10, 0xce, 0xf6, 0xed, + 0x47, 0x8f, 0xe1, 0xff, 0x7f, 0x5a, 0xd5, 0x5d, 0x94, 0x38, 0x2f, 0xa1, 0xd4, 0xef, 0x82, 0xb1, + 0x0d, 0xc4, 0x43, 0xec, 0xbe, 0x77, 0xb6, 0x82, 0x9c, 0xfa, 0x17, 0x87, 0x84, 0x82, 0x25, 0x46, + 0xfb, 0xd6, 0x05, 0xc8, 0x9a, 0x7e, 0xad, 0x44, 0x40, 0x0d, 0x35, 0x9c, 0x45, 0x44, 0x64, 0x36, + 0x61, 0x4b, 0xf7, 0xe6, 0x31, 0x5c, 0x7d, 0x96, 0x73, 0xe8, 0xac, 0xb4, 0xe3, 0x5e, 0xd1, 0x9d, +}; #endif #define RSA_HEAP_SIZE (4*1024) // RSA用ヒープサイズ (サイズ調整必要) @@ -109,16 +118,6 @@ static char* debugPtr = (char*)PRINT_MEMORY_ADDR; ***************************************************************/ static void PreInit(void) { - static const OSMountInfo firmSettings[] = - { - // drive device target pertitionIdx resource userPermission rsvA B archive path - { 'A', OS_MOUNT_DEVICE_SD, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "sdmc", "/" }, - { 'B', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand", "/" }, // ユーザーアプリはこのアーカイブではWrite不可 - { 'C', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 1, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand2", "/" }, // ユーザーアプリはこのアーカイブではWrite不可 - { 'D', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "shared2", "nand2:/shared2" }, - { 'E', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_DIR, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "photo", "nand2:/photo" }, - { 0 } - }; /* メインメモリ関連 */ @@ -128,9 +127,6 @@ static void PreInit(void) MI_CpuClearFast((void *)HW_PXI_SIGNAL_PARAM_ARM9, (HW_MMEMCHECKER_MAIN - HW_PXI_SIGNAL_PARAM_ARM9)); MI_CpuClearFast((void*)HW_ROM_HEADER_BUF, (HW_ROM_HEADER_BUF_END-HW_ROM_HEADER_BUF)); - // FS_MOUNT領域の初期化 - MI_CpuCopy8(firmSettings, (char*)HW_TWL_FS_MOUNT_INFO_BUF, sizeof(firmSettings)); - /* FromBrom関連 */ @@ -163,7 +159,7 @@ static void PostInit(void) ***************************************************************/ static BOOL CheckHeader(void) { - static ROM_Header_Short* const rhs = (ROM_Header_Short*)HW_TWL_ROM_HEADER_BUF; + ROM_Header_Short* const rhs = (ROM_Header_Short*)HW_TWL_ROM_HEADER_BUF; // イニシャルコードなど OS_TPrintf("Initial Code : %08X (%.4s)\n", *(u32*)rhs->game_code, rhs->game_code); OS_TPrintf("Platform Code : %02X\n", rhs->platform_code); @@ -269,19 +265,19 @@ void TwlMain( void ) switch ( PAD_Read() & PAD_KEYPORT_MASK ) { case 0: - STD_CopyString((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, MENU_FILE); + STD_CopyString((char*)HW_FIRM_TEMP_SRL_PATH_BUF, MENU_FILE); break; case PAD_BUTTON_A: - STD_CopyString((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, MENU_FILE_A); + STD_CopyString((char*)HW_FIRM_TEMP_SRL_PATH_BUF, MENU_FILE_A); break; case PAD_BUTTON_B: - STD_CopyString((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, MENU_FILE_B); + STD_CopyString((char*)HW_FIRM_TEMP_SRL_PATH_BUF, MENU_FILE_B); break; case PAD_BUTTON_L: - STD_CopyString((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, MENU_FILE_L); + STD_CopyString((char*)HW_FIRM_TEMP_SRL_PATH_BUF, MENU_FILE_L); break; case PAD_BUTTON_R: - STD_CopyString((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, MENU_FILE_R); + STD_CopyString((char*)HW_FIRM_TEMP_SRL_PATH_BUF, MENU_FILE_R); break; default: OS_TPrintf("Unknown pad pattern (%X).\n", PAD_Read() & PAD_KEYPORT_MASK); @@ -294,7 +290,7 @@ void TwlMain( void ) // 5: after PXI PUSH_PROFILE(); - if ( !FS_LoadHeader( &acPool, RSA_KEY1_ADDR, RSA_KEY2_ADDR ) || !CheckHeader() ) + if ( !FS_LoadHeader( &acPool, rsa_key_user, rsa_key_sys, rsa_key_secure ) || !CheckHeader() ) { OS_TPrintf("Failed to call FS_LoadHeader() and/or CheckHeader().\n"); goto end; diff --git a/include/firm/fs/ARM7/fs_firm.h b/include/firm/fs/ARM7/fs_firm.h index c0e98a6c..9ab0388d 100644 --- a/include/firm/fs/ARM7/fs_firm.h +++ b/include/firm/fs/ARM7/fs_firm.h @@ -22,6 +22,29 @@ extern "C" { #endif +/*---------------------------------------------------------------------------* + Name: FS_InitMountInfo + + Description: set mount info for firm + + Arguments: nand TRUE if set nand entry + sdmc TRUE if set sdmc entry + + Returns: None + *---------------------------------------------------------------------------*/ +void FS_InitMountInfo( BOOL nand, BOOL sdmc ); + +/*---------------------------------------------------------------------------* + Name: FS_SetMountInfoForSrl + + Description: set mount info for srl file + + Arguments: None + + Returns: None + *---------------------------------------------------------------------------*/ +void FS_SetMountInfoForSrl( void ); + /*---------------------------------------------------------------------------* Name: FS_OpenSrl diff --git a/include/firm/fs/ARM9/fs_firm.h b/include/firm/fs/ARM9/fs_firm.h index 21e772b0..091ea8b6 100644 --- a/include/firm/fs/ARM9/fs_firm.h +++ b/include/firm/fs/ARM9/fs_firm.h @@ -54,7 +54,7 @@ BOOL FS_GetTitleBootContentPathFast(char* buf, OSTitleId titleId); /*---------------------------------------------------------------------------* Name: FS_ResolveSrl - Description: resolve srl filename and store to HW_TWL_FS_BOOT_SRL_PATH_BUF + Description: resolve srl filename and store to HW_FIRM_TEMP_SRL_PATH_BUF Arguments: titleId title id for srl file @@ -65,7 +65,7 @@ BOOL FS_ResolveSrl( OSTitleId titleId ); /*---------------------------------------------------------------------------* Name: FS_ResolveSrlUnsecured - Description: resolve srl filename and store to HW_TWL_FS_BOOT_SRL_PATH_BUF + Description: resolve srl filename and store to HW_FIRM_TEMP_SRL_PATH_BUF without almost security check Arguments: titleId title id for srl file diff --git a/include/firm/fs/ARM9/fs_loader.h b/include/firm/fs/ARM9/fs_loader.h index fa54f468..10f193a3 100644 --- a/include/firm/fs/ARM9/fs_loader.h +++ b/include/firm/fs/ARM9/fs_loader.h @@ -63,13 +63,13 @@ BOOL FS_LoadModule( u8* dest, u32 offset, u32 size, const u8 digest[SVC_SHA1_BLO and verify signature Arguments: pool heap context to call SVC_DecryptSign - rsa_key1 public key to verify the signature - rsa_key2 public key to verify the signature - for system applications + rsa_key_user public key to verify the signature for user application + rsa_key_sys public key to verify the signature for system application + rsa_key_secure public key to verify the signature for secure application Returns: TRUE if success *---------------------------------------------------------------------------*/ -BOOL FS_LoadHeader( SVCSignHeapContext* pool, const void* rsa_key1, const void* rsa_key2 ); +BOOL FS_LoadHeader( SVCSignHeapContext* pool, const void* rsa_key_user, const void* rsa_key_sys, const void* rsa_key_secure ); /*---------------------------------------------------------------------------* Name: FS_LoadStatic diff --git a/include/firm/hw/ARM7/mmap_firm.h b/include/firm/hw/ARM7/mmap_firm.h index 0a4752ab..ebd6edd3 100644 --- a/include/firm/hw/ARM7/mmap_firm.h +++ b/include/firm/hw/ARM7/mmap_firm.h @@ -46,6 +46,17 @@ extern "C" { #define HW_FIRM_FROM_FIRM_BUF_END (HW_WRAM_AREA_END - 0x1000) // END - 4KB #define HW_FIRM_FROM_FIRM_BUF_SIZE 0x2C00 // 11KB +//------------------------------------- FIRM_MOUNT_INFO_BUF +extern void SDK_MOUNT_INFO_TABLE(void); +#define HW_FIRM_MOUNT_INFO_BUF (u32)SDK_MOUNT_INFO_TABLE +#define HW_FIRM_MOUNT_INFO_BUF_END (HW_FIRM_MOUNT_INFO_BUF + HW_FIRM_MOUNT_INFO_BUF_SIZE) +#define HW_FIRM_MOUNT_INFO_BUF_SIZE (0x400 - OS_MOUNT_PATH_LEN) + +//------------------------------------- FIRM_BOOT_SRL_PATH_BUF +#define HW_FIRM_BOOT_SRL_PATH_BUF HW_FIRM_MOUNT_INFO_BUF_END +#define HW_FIRM_BOOT_SRL_PATH_BUF_END (HW_FIRM_BOOT_SRL_PATH_BUF + HW_FIRM_BOOT_SRL_PATH_BUF_SIZE) +#define HW_FIRM_BOOT_SRL_PATH_BUF_SIZE FS_ENTRY_LONGNAME_MAX + #ifdef __cplusplus } /* extern "C" */ diff --git a/include/firm/hw/common/mmap_firm.h b/include/firm/hw/common/mmap_firm.h index dd22402e..d2847fa5 100644 --- a/include/firm/hw/common/mmap_firm.h +++ b/include/firm/hw/common/mmap_firm.h @@ -32,9 +32,9 @@ extern "C" { #define HW_FIRM_LOAD_BUFFER_END (HW_FIRM_LOAD_BUFFER_BASE + HW_FIRM_LOAD_BUFFER_SIZE) //------------------------------------- FS/FATFS -#define HW_FIRM_FS_AES_BUFFER (HW_FIRM_FS_AES_BUFFER_END - HW_FIRM_FS_AES_BUFFER_SIZE) // 0x02FF3800 -#define HW_FIRM_FS_AES_BUFFER_SIZE 0x4000 -#define HW_FIRM_FS_AES_BUFFER_END HW_FIRM_FATFS_COMMAND_BUFFER // 0x02ff7800 +#define HW_FIRM_TEMP_SRL_PATH_BUF (HW_FIRM_TEMP_SRL_PATH_BUF_END - HW_FIRM_TEMP_SRL_PATH_BUF_SIZE) // 0x2ff76fc +#define HW_FIRM_TEMP_SRL_PATH_BUF_SIZE FS_ENTRY_LONGNAME_MAX +#define HW_FIRM_TEMP_SRL_PATH_BUF_END HW_FIRM_FATFS_COMMAND_BUFFER // 0x02ff7800 #define HW_FIRM_FATFS_COMMAND_BUFFER (HW_FIRM_FATFS_COMMAND_BUFFER_END - HW_FIRM_FATFS_COMMAND_BUFFER_SIZE) #define HW_FIRM_FATFS_COMMAND_BUFFER_SIZE FATFS_COMMAND_BUFFER_MAX // 0x800