From 3a1d361e60b0a382d9b675b71e65c8034d38658a Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 18 Feb 2008 05:41:27 +0000
Subject: [PATCH] =?UTF-8?q?NotLaunch=E3=83=95=E3=83=A9=E3=82=B0=E3=81=8C?=
 =?UTF-8?q?=E9=80=86=E8=BB=A2=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7=E4=BF=AE=E6=AD=A32=20X3=E5=9F=BA=E7=9B=A4=E7=94=A8?=
 =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E3=83=A9=E3=82=A4=E3=83=88=E8=BC=9D?=
 =?UTF-8?q?=E5=BA=A6=E8=A1=A8=E7=A4=BA=E6=BA=96=E5=82=99?=
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@687 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../Launcher/ARM9/src/launcher.c              | 44 ++++++++++++++++---
 .../Launcher/ARM9/src/loadWlanFirm.c          |  2 +-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
index 543bb7d5..c372adae 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -21,6 +21,7 @@
 #include "bannerCounter.h"
 #include "sound.h"
 #include <math.h>
+#include <sysmenu/mcu.h>
 
 
 // define data------------------------------------------
@@ -421,9 +422,25 @@ BOOL LauncherFadeout( TitleProperty *pTitleList )
 	static int fadecount = 0;
 	
 	// 描画関係
-    //NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL );
-	//PrintfSJIS( 0, 0, TXT_COLOR_BLUE, "TWL-SYSTEM MENU ver.%06x", SYSMENU_VER );
-	//DrawBackLightSwitch();
+
+	// 輝度表示
+	// X3基盤から、Select+音量で輝度変更できるようになったので、毎フレーム輝度表示を変更する必要あり
+/*
+#ifdef SDK_SUPPORT_PMIC_2
+	if ( SYSMi_GetMcuVersion() <= 1 )
+	{
+		// 何もしない
+	}
+	else
+#endif // SDK_SUPPORT_PMIC_2
+	{
+		u8 brightness;
+		( void )SYSM_ReadMcuRegisterAsync( MCU_REG_BL_ADDR, &brightness, NULL, NULL );
+		SYSM_SetBackLightBrightness( brightness );
+		DrawBackLightSwitch();
+	}
+*/
+	
 	DrawScrollBar( pTitleList );
 	
 	#ifdef DBGBNR
@@ -705,9 +722,24 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
 	MoveByScrollBar();
 	
 	// 描画関係
-    //NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL );
-	//PrintfSJIS( 0, 0, TXT_COLOR_BLUE, "TWL-SYSTEM MENU ver.%06x", SYSMENU_VER );
-	//DrawBackLightSwitch();
+
+	// 輝度表示
+	// X3基盤から、Select+音量で輝度変更できるようになったので、毎フレーム輝度表示を変更する必要あり
+/*
+#ifdef SDK_SUPPORT_PMIC_2
+	if ( SYSMi_GetMcuVersion() <= 1 )
+	{
+		// 何もしない
+	}
+	else
+#endif // SDK_SUPPORT_PMIC_2
+	{
+		u8 brightness;
+		( void )SYSM_ReadMcuRegisterAsync( MCU_REG_BL_ADDR, &brightness, NULL, NULL );
+		SYSM_SetBackLightBrightness( brightness );
+		DrawBackLightSwitch();
+	}
+*/
 	
 	DrawScrollBar( pTitleList );
 	
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index 7dd1516f..4da32c01 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -115,7 +115,7 @@ s32 readFirmwareBinary(u8 *buffer, s32 bufSize)
 #endif
 
 
-    titleID_hi = (( 3 /* Nintendo */ << 16) | 4 /* */ | 1 /* */);
+    titleID_hi = (( 3 /* Nintendo */ << 16) | 4 /* */ | 2 /* */ | 1 /* */);
 
     titleID_lo =  ((u32)( title[0] ) & 0xff) << 24;
     titleID_lo |= ((u32)( title[1] )& 0xff) << 16;