From 85e08a7801b74034859545fefd999c5f92560b46 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 10 Apr 2008 07:40:51 +0000
Subject: [PATCH] =?UTF-8?q?ROM=E3=82=A8=E3=83=9F=E3=83=A5=E3=83=AC?=
 =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E6=83=85=E5=A0=B1=E3=81=8C?=
 =?UTF-8?q?ARM9=E3=81=B8=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82=20HOTSW?=
 =?UTF-8?q?=5FGetRomEmulationBuffer()=E3=82=92ARM9=E3=81=A8ARM7=E3=81=A7?=
 =?UTF-8?q?=E5=85=B1=E9=80=9A=E3=81=AE=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AB?=
 =?UTF-8?q?=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@1098 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 17 +++--------------
 include/sysmenu/hotsw/common/hotsw.h           |  4 ----
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 3bef7625..c73dc077 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -26,7 +26,7 @@
 #define DEBUG_MODE
 
 // カード電源ONからROMヘッダロードまでの期間にスリープに入る時のワンセグ対策しない場合
-//#define HOWSW_TRY_DEEP_SLEEP_WHILE_INSERT_CARD
+//#define HOWSW_ENABLE_DEEP_SLEEP_WHILE_INSERT_CARD
 
 // define -------------------------------------------------------------------
 #define		CHATTERING_COUNTER					0x1988		// 100ms分 (0x1988 * 15.3us = 100000us)
@@ -296,7 +296,7 @@ static HotSwState LoadCardData(void)
 
     // カード電源リセット
 	McPowerOff();
-#ifndef HOWSW_TRY_DEEP_SLEEP_WHILE_INSERT_CARD
+#ifndef HOWSW_ENABLE_DEEP_SLEEP_WHILE_INSERT_CARD
     MCU_EnableDeepSleepToPowerLine( MCU_PWR_LINE_33, FALSE );
 #endif
 	McPowerOn();
@@ -662,17 +662,6 @@ HotSwState HOTSWi_RefreshBadBlock(u32 romMode)
 }
 
 
-/*---------------------------------------------------------------------------*
-  Name:         HOTSW_GetRomEmulationBuffer
-
-  Description:  Romエミュレーション情報を格納しているバッファへのポインタを返す
- *---------------------------------------------------------------------------*/
-void* HOTSW_GetRomEmulationBuffer(void)
-{
-	return &s_romEmuInfo;
-}
-
-
 /*---------------------------------------------------------------------------*
   Name:         HOTSWi_IsRunOnDebugger
 
@@ -741,7 +730,7 @@ static HotSwState LoadBannerData(void)
    	// デバッガ情報
 	if ( ! SYSMi_GetWork()->flags.hotsw.is1stCardChecked && debuggerFlg )
 	{
-		MI_CpuCopy8( HOTSW_GetRomEmulationBuffer(), &s_romEmuInfo, ROM_EMULATION_DATA_SIZE );
+		MI_CpuCopy8( &s_romEmuInfo, &(SYSMi_GetWork()->romEmuInfo), ROM_EMULATION_DATA_SIZE );
 		SYSMi_GetWork()->flags.hotsw.isOnDebugger = debuggerFlg;
 	}
 
diff --git a/include/sysmenu/hotsw/common/hotsw.h b/include/sysmenu/hotsw/common/hotsw.h
index 9a762da0..ae0c5cec 100644
--- a/include/sysmenu/hotsw/common/hotsw.h
+++ b/include/sysmenu/hotsw/common/hotsw.h
@@ -75,14 +75,10 @@ void HOTSW_SetBootSegmentBuffer(void* buf, u32 size);
 void HOTSW_SetSecureSegmentBuffer(ModeType type ,void* buf, u32 size);
 
 // Romエミュレーション情報を格納しているバッファのポインタを返す
-#ifdef SDK_ARM7
-void* HOTSW_GetRomEmulationBuffer(void);
-#else // SDK_ARM9
 SDK_INLINE void* HOTSW_GetRomEmulationBuffer(void)
 {
 	return (void*)&SYSMi_GetWork()->romEmuInfo;
 }
-#endif // SDK_ARM9
 
 // ISデバッガ上で動作しているか？
 BOOL HOTSWi_IsRunOnDebugger(void);