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" */