OSTitleId対応 (SDK 4402以降)

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@764 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2008-02-28 07:46:12 +00:00
parent a13d67740b
commit 5053ca0b24
4 changed files with 11 additions and 10 deletions

View File

@ -47,12 +47,13 @@ void FS_InitFIRM( void )
NAMi_Free NAMi_Free
Arguments: titleId: TitleID Arguments: pTmd:
titleId: TitleID
Returns: TRUEを返します Returns: TRUEを返します
FALSE FALSE
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static BOOL LoadTMD(ESTitleMeta* pTmd, u64 titleId) static BOOL LoadTMD(ESTitleMeta* pTmd, OSTitleId titleId)
{ {
char path[64]; char path[64];
FSFile f; FSFile f;
@ -128,7 +129,7 @@ static BOOL LoadTMD(ESTitleMeta* pTmd, u64 titleId)
Returns: TRUE Returns: TRUE
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL FS_GetTitleBootContentPathFast(char* buf, u64 titleId) BOOL FS_GetTitleBootContentPathFast(char* buf, OSTitleId titleId)
{ {
ESTitleMeta tmd; ESTitleMeta tmd;
u32 bootContentId; u32 bootContentId;
@ -181,7 +182,7 @@ BOOL FS_GetTitleBootContentPathFast(char* buf, u64 titleId)
Returns: TRUE if success Returns: TRUE if success
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL FS_ResolveSrl( u64 titleId ) BOOL FS_ResolveSrl( OSTitleId titleId )
{ {
if ( ES_ERR_OK != ES_InitLib() || 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_TWL_FS_BOOT_SRL_PATH_BUF) ||
@ -202,7 +203,7 @@ BOOL FS_ResolveSrl( u64 titleId )
Returns: TRUE if success Returns: TRUE if success
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL FS_ResolveSrlUnsecured( u64 titleId ) BOOL FS_ResolveSrlUnsecured( OSTitleId titleId )
{ {
if ( !FS_GetTitleBootContentPathFast((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, titleId) ) if ( !FS_GetTitleBootContentPathFast((char*)HW_TWL_FS_BOOT_SRL_PATH_BUF, titleId) )
{ {

View File

@ -128,7 +128,7 @@ static void PostInit(void)
***************************************************************/ ***************************************************************/
static BOOL TryResolveSrl(void) static BOOL TryResolveSrl(void)
{ {
u64 titleId = MENU_TITLE_ID_HI << 32; OSTitleId titleId = MENU_TITLE_ID_HI << 32;
if ( !LCFG_ReadHWSecureInfo() ) if ( !LCFG_ReadHWSecureInfo() )
{ {
OS_TPrintf("Failed to load HWSecureInfo.\n"); OS_TPrintf("Failed to load HWSecureInfo.\n");

View File

@ -130,7 +130,7 @@ static void PostInit(void)
***************************************************************/ ***************************************************************/
static BOOL TryResolveSrl(void) static BOOL TryResolveSrl(void)
{ {
u64 titleId = MENU_TITLE_ID_HI << 32; OSTitleId titleId = MENU_TITLE_ID_HI << 32;
if ( !LCFG_ReadHWSecureInfo() ) if ( !LCFG_ReadHWSecureInfo() )
{ {
OS_TPrintf("Failed to load HWSecureInfo.\n"); OS_TPrintf("Failed to load HWSecureInfo.\n");

View File

@ -49,7 +49,7 @@ void FS_InitFIRM( void );
Returns: TRUE Returns: TRUE
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL FS_GetTitleBootContentPathFast(char* buf, u64 titleId); BOOL FS_GetTitleBootContentPathFast(char* buf, OSTitleId titleId);
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: FS_ResolveSrl Name: FS_ResolveSrl
@ -60,7 +60,7 @@ BOOL FS_GetTitleBootContentPathFast(char* buf, u64 titleId);
Returns: TRUE if success Returns: TRUE if success
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL FS_ResolveSrl( u64 titleId ); BOOL FS_ResolveSrl( OSTitleId titleId );
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: FS_ResolveSrlUnsecured Name: FS_ResolveSrlUnsecured
@ -72,7 +72,7 @@ BOOL FS_ResolveSrl( u64 titleId );
Returns: TRUE if success Returns: TRUE if success
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOL FS_ResolveSrlUnsecured( u64 titleId ); BOOL FS_ResolveSrlUnsecured( OSTitleId titleId );
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */