From a46da6bc6b38bf77f224b3e51f6707ffbaf0cc3d Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 4 Feb 2008 09:17:51 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=88=E3=82=92=E4=BB=98=E3=81=91=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=20=E4=B8=80=E6=99=82?=
 =?UTF-8?q?=E7=9A=84=E3=81=AB=E3=83=90=E3=83=83=E3=83=86=E3=83=AA=E3=83=BC?=
 =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=89=8D=E3=81=ABMCU?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=92=E8=BF=BD=E5=8A=A0?=
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@568 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/nandfirm/menu-launcher/ARM7/main.c  | 20 +++++++++++---------
 build/nandfirm/menu-launcher2/ARM7/main.c | 12 +++++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c
index f5dc3433..abc34f8c 100644
--- a/build/nandfirm/menu-launcher/ARM7/main.c
+++ b/build/nandfirm/menu-launcher/ARM7/main.c
@@ -97,6 +97,7 @@ static void PreInit(void)
     /*
         バッテリー残量チェック
     */
+    if ( MCUi_ReadRegister( MCU_REG_VER_INFO_ADDR ) >= 0x20 )   // MCU旧バージョン対策
     if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 )
     {
         OS_TPrintf("Battery is empty.\n");
@@ -132,6 +133,7 @@ static void PostInit(void)
     /*
         バッテリー残量チェック
     */
+    if ( MCUi_ReadRegister( MCU_REG_VER_INFO_ADDR ) >= 0x20 )   // MCU旧バージョン対策
     if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 )
     {
         OS_TPrintf("Battery is empty.\n");
@@ -185,7 +187,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x84
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     SDNandContext = &OSi_GetFromFirmAddr()->SDNandContext;
     if ( !FATFS_Init( DMA_FATFS_1, DMA_FATFS_2, THREAD_PRIO_FATFS ) )
@@ -197,7 +199,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x85
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     if ( PXI_RecvID() != FIRM_PXI_ID_SET_PATH )
     {
@@ -208,7 +210,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x86
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     if ( (fd = FS_OpenSrl()) < 0 )
     {
@@ -219,7 +221,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x87
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     if ( !FS_LoadHeader( fd ) )
     {
@@ -230,7 +232,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x88
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     if ( PXI_RecvID() != FIRM_PXI_ID_DONE_HEADER )
     {
@@ -241,7 +243,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x89
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     AESi_InitKeysFIRM();
     AESi_RecvSeed( rh->s.developer_encrypt );
@@ -249,7 +251,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x8a
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     if ( !FS_LoadStatic( fd ) )
     {
@@ -260,7 +262,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x8b
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     if ( PXI_RecvID() != FIRM_PXI_ID_DONE_STATIC )
     {
@@ -294,7 +296,7 @@ void TwlSpMain( void )
 #endif
     SetDebugLED( 0 );
 
-    PM_BackLightOn( TRUE ); // last chance
+//    PM_BackLightOn( TRUE ); // last chance
 
     OS_BootFromFIRM();
 
diff --git a/build/nandfirm/menu-launcher2/ARM7/main.c b/build/nandfirm/menu-launcher2/ARM7/main.c
index 8978e012..b5659ca4 100644
--- a/build/nandfirm/menu-launcher2/ARM7/main.c
+++ b/build/nandfirm/menu-launcher2/ARM7/main.c
@@ -98,6 +98,7 @@ static void PreInit(void)
     /*
         バッテリー残量チェック
     */
+    if ( MCUi_ReadRegister( MCU_REG_VER_INFO_ADDR ) >= 0x20 )   // MCU旧バージョン対策
     if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 )
     {
         OS_TPrintf("Battery is empty.\n");
@@ -133,6 +134,7 @@ static void PostInit(void)
     /*
         バッテリー残量チェック
     */
+    if ( MCUi_ReadRegister( MCU_REG_VER_INFO_ADDR ) >= 0x20 )   // MCU旧バージョン対策
     if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 )
     {
         OS_TPrintf("Battery is empty.\n");
@@ -184,7 +186,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x84
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     SDNandContext = &OSi_GetFromFirmAddr()->SDNandContext;
     if ( !FATFS_Init( DMA_FATFS_1, DMA_FATFS_2, THREAD_PRIO_FATFS ) )
@@ -196,7 +198,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x85
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
     // 5:
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x86
@@ -222,7 +224,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x89
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
 
     AESi_InitKeysFIRM();
     AESi_RecvSeed( rh->s.developer_encrypt );
@@ -230,7 +232,7 @@ void TwlSpMain( void )
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x8a
 
-    PM_BackLightOn( FALSE );
+//    PM_BackLightOn( FALSE );
     // 10:
     PUSH_PROFILE();
     SetDebugLED(++step); // 0x8b
@@ -269,7 +271,7 @@ void TwlSpMain( void )
 #endif
     SetDebugLED( 0 );
 
-    PM_BackLightOn( TRUE ); // last chance
+//    PM_BackLightOn( TRUE ); // last chance
 
     OS_BootFromFIRM();