From d42a9c8bcbae13551d97ad2a8bce4b53c677d55e Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 31 Mar 2008 03:54:50 +0000
Subject: [PATCH] =?UTF-8?q?=E5=8F=A4=E3=81=84NandFormatter.srl=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=E3=81=AE=E3=81=9F=E3=82=81=E3=80=81HLNJ=E3=81=A7?=
 =?UTF-8?q?=E3=82=82=E3=83=AA=E3=83=88=E3=83=A9=E3=82=A4=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
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@1003 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/nandfirm/menu-launcher/ARM9/main.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c
index c22bfae2..1a90ea88 100644
--- a/build/nandfirm/menu-launcher/ARM9/main.c
+++ b/build/nandfirm/menu-launcher/ARM9/main.c
@@ -43,6 +43,10 @@ static SVCSignHeapContext acPool;
 #define MENU_TITLE_ID_LO    0x484c4e41ULL
 #define MENU_TITLE_ID       (MENU_TITLE_ID_HI << 32 | MENU_TITLE_ID_LO)
 
+// 過去の互換性のため、しばらく
+#define MENU_TITLE_ID_LO_TEMP   0x484c4e4aULL   // HLNJ
+#define MENU_TITLE_ID_TEMP      (MENU_TITLE_ID_HI << 32 | MENU_TITLE_ID_LO_TEMP)
+
 /*
     PROFILE_ENABLE を定義するとある程度のパフォーマンスチェックができます。
     利用するためには、main.cかどこかに、u32 profile[256]; u32 pf_cnt = 0; を
@@ -154,6 +158,21 @@ static BOOL RetryResolveSrl(void)
     OS_TPrintf("Launcher Title ID: 0x%016llx\n", MENU_TITLE_ID);
     return TRUE;
 }
+/***************************************************************
+    RetryResoleSrlTemp
+
+    HWInfo下位互換のため、決めうちでランチャーSRLを解決する
+***************************************************************/
+static BOOL RetryResoleSrlTemp(void)
+{
+    if ( !FS_ResolveSrl( MENU_TITLE_ID_TEMP ) )
+    {
+        OS_TPrintf("Failed to call FS_ResolveSrl( 0x%016llx ).\n", MENU_TITLE_ID_TEMP);
+        return FALSE;
+    }
+    OS_TPrintf("Launcher Title ID: 0x%016llx\n", MENU_TITLE_ID_TEMP);
+    return TRUE;
+}
 
 /***************************************************************
     CheckHeader
@@ -261,7 +280,7 @@ void TwlMain( void )
     // 3: after PostInit
     PUSH_PROFILE();
 
-    if ( !TryResolveSrl() && !RetryResolveSrl() )
+    if ( !TryResolveSrl() && !RetryResolveSrl() && !RetryResoleSrlTemp() )
     {
         goto end;
     }