From 4b18b6b6c9b80c746c2e123be86dad204f2917de Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 16 Jan 2008 07:32:57 +0000
Subject: [PATCH] =?UTF-8?q?HW=5FISD=5FRESERVED=EF=BC=88NITRO=E3=83=87?=
 =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AC=E7=94=A8=EF=BC=89=E7=B5=8C=E7=94=B1?=
 =?UTF-8?q?=E3=81=A7ARM9=E3=81=B8ROM=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=82=92?=
 =?UTF-8?q?=E6=B8=A1=E3=81=99=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@470 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/components/hyena.TWL/wram_regs/wram_regs.c | 2 +-
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c   | 2 ++
 include/sysmenu/hotsw/common/hotsw.h             | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build/components/hyena.TWL/wram_regs/wram_regs.c b/build/components/hyena.TWL/wram_regs/wram_regs.c
index 3fd8ea2e..0d93fa87 100644
--- a/build/components/hyena.TWL/wram_regs/wram_regs.c
+++ b/build/components/hyena.TWL/wram_regs/wram_regs.c
@@ -38,7 +38,7 @@
 // WRAM-0           Master:ARM9,               (16Kbytes),  Address(7):0x03040000-0x03043fff, Address(9):0x03040000-0x03043fff
 // WRAM-1           Master:ARM9,               (16Kbytes),  Address(7):0x03044000-0x03047fff, Address(9):0x03044000-0x03047fff
 
-u32 REBOOTi_WramRegDS[0x30/sizeof(u32)] =
+u32 HYENA_WramReg[0x30/sizeof(u32)] =
 {
     // ARM9
 
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 56464cff..570d43e1 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -632,6 +632,8 @@ static void ReadRomEmulationData(void)
         }
         count+=4;
 	}
+
+   	MI_CpuCopyFast(s_cbData.romEmuBuf, (void*)HW_ISD_RESERVED, 32);
 }
 
 /* -----------------------------------------------------------------
diff --git a/include/sysmenu/hotsw/common/hotsw.h b/include/sysmenu/hotsw/common/hotsw.h
index b968b9b4..633f466d 100644
--- a/include/sysmenu/hotsw/common/hotsw.h
+++ b/include/sysmenu/hotsw/common/hotsw.h
@@ -11,9 +11,7 @@
 extern "C" {
 #endif
 
-#ifdef SDK_ARM7
 #define SYSM_HOTSW_ENABLE_ROMEMU
-#endif // SDK_ARM7
 
 // Function prototype -------------------------------------------------------
 // 活栓挿抜処理の初期化
@@ -32,7 +30,14 @@ void HOTSW_SetBootSegmentBuffer(void* buf, u32 size);
 void HOTSW_SetSecureSegmentBuffer(void* buf, u32 size);
 
 // Romエミュレーション情報を格納しているバッファのポインタを返す
+#ifdef SDK_ARM7
 void* HOTSW_GetRomEmulationBuffer(void);
+#else // SDK_ARM9
+SDK_INLINE void* HOTSW_GetRomEmulationBuffer(void)
+{
+	return (void*)HW_ISD_RESERVED;
+}
+#endif // SDK_ARM9
 
 #ifdef __cplusplus
 } /* extern "C" */