From f38a739e5eff53ae6539c403d191a9025df035c6 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 22 Apr 2008 02:10:38 +0000
Subject: [PATCH] =?UTF-8?q?OS=5FInitFIRM=E3=81=AEARM7=E5=81=B4=E3=81=ABMI?=
 =?UTF-8?q?=5FInit=E8=BF=BD=E5=8A=A0=E3=80=82=20menu-launcher=E3=82=92?=
 =?UTF-8?q?=E3=82=82=E3=81=86=E5=B0=91=E3=81=97=E7=B4=B0=E3=81=8B=E3=81=8F?=
 =?UTF-8?q?=E3=83=88=E3=83=AC=E3=83=BC=E3=82=B9=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=80=82?=
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@1205 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries/os/common/os_init_firm.c |  5 +++++
 build/nandfirm/menu-launcher/ARM7/main.c | 27 +++++++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/build/libraries/os/common/os_init_firm.c b/build/libraries/os/common/os_init_firm.c
index 26aa0c0c..4bb6f8b0 100644
--- a/build/libraries/os/common/os_init_firm.c
+++ b/build/libraries/os/common/os_init_firm.c
@@ -133,6 +133,11 @@ void OS_InitFIRM(void)
     OS_InitException();
 #endif
 
+    //---- Init MI
+#ifdef SDK_TWL
+    MI_Init();
+#endif
+
     //---- Init Tick
     OS_InitTick();
 
diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c
index b33ff0c9..d58a6070 100644
--- a/build/nandfirm/menu-launcher/ARM7/main.c
+++ b/build/nandfirm/menu-launcher/ARM7/main.c
@@ -126,14 +126,22 @@ static void PostInit(void)
     }
     // AESの初期化
     AES_Init(); // for encrypted NAND
+    PUSH_PROFILE();
+    SetDebugLED(++step); // 0x85
+
     // マウント情報の初期化
     FS_InitMountInfo(TRUE, FALSE);
     // アイドルスレッドの作成
     CreateIdleThread();
+    PUSH_PROFILE();
+    SetDebugLED(++step); // 0x86
+
     /*
         バッテリー残量チェック
     */
     MCUi_WriteRegister( MCU_REG_MODE_ADDR, MCU_SYSTEMMODE_FIRMWARE );   // change battery level only
+    PUSH_PROFILE();
+    SetDebugLED(++step); // 0x87
     if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 )
     {
 #ifndef SDK_FINALROM
@@ -188,11 +196,14 @@ void TwlSpMain( void )
 
     OS_EnableIrq();
     OS_EnableInterrupts();
+    PUSH_PROFILE();
+    SetDebugLED(++step); // 0x84
 
     PostInit();
     // 3: after PostInit
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x84
+    step = 0x88;
+    SetDebugLED(step); // 0x88
 
 //    PM_BackLightOn( FALSE );
 
@@ -203,7 +214,7 @@ void TwlSpMain( void )
     }
     // 4: after FATFS_Init
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x85
+    SetDebugLED(++step); // 0x89
 
 //    PM_BackLightOn( FALSE );
 
@@ -214,7 +225,7 @@ void TwlSpMain( void )
     }
     // 5: after PXI
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x86
+    SetDebugLED(++step); // 0x8a
 
 //    PM_BackLightOn( FALSE );
 
@@ -225,7 +236,7 @@ void TwlSpMain( void )
     }
     // 6: after FS_OpenSrl
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x87
+    SetDebugLED(++step); // 0x8b
 
 //    PM_BackLightOn( FALSE );
 
@@ -236,7 +247,7 @@ void TwlSpMain( void )
     }
     // 7: after FS_LoadHeader
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x88
+    SetDebugLED(++step); // 0x8c
 
 //    PM_BackLightOn( FALSE );
 
@@ -247,7 +258,7 @@ void TwlSpMain( void )
     }
     // 8: after PXI
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x89
+    SetDebugLED(++step); // 0x8d
 
 //    PM_BackLightOn( FALSE );
 
@@ -255,7 +266,7 @@ void TwlSpMain( void )
     AESi_InitSeed();
     // 9: after AESi_InitSeed
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x8a
+    SetDebugLED(++step); // 0x8e
 
 //    PM_BackLightOn( FALSE );
 
@@ -266,7 +277,7 @@ void TwlSpMain( void )
     }
     // 10: after FS_LoadStatic
     PUSH_PROFILE();
-    SetDebugLED(++step); // 0x8b
+    SetDebugLED(++step); // 0x8f
 
 //    PM_BackLightOn( FALSE );