From 40c7210ca8f12481b9cb684ba773fd34d4d7161a Mon Sep 17 00:00:00 2001 From: nakasima Date: Fri, 15 Aug 2008 04:47:08 +0000 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=9D=A5=E3=81=AETAD=E3=83=87?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=B0=E3=81=A7=E3=82=A8=E3=83=9F=E3=83=A5?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3ROM=E3=81=A0?= =?UTF-8?q?=E3=81=91=E3=81=A7=E3=81=AA=E3=81=8F=E9=96=8B=E7=99=BA=E3=82=AB?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=83=AA=E3=83=BC=E3=83=89=E3=81=B8=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BA=8B=E5=89=8D=E5=AF=BE=E5=BF=9C=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@2162 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index fb9f310b..853d89b1 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -150,6 +150,7 @@ static u32 *s_pSecure2SegBuffer; static CardBootData s_cbData ATTRIBUTE_ALIGN(4); static SYSMRomEmuInfo s_romEmuInfo; +static BOOL s_isRomEmu; static BOOL s_debuggerFlg; static BOOL s_isPulledOut = TRUE; @@ -413,7 +414,9 @@ static HotSwState LoadCardData(void) // よって、ROMエミュレーション情報リード部分をデバッガビルド時以外に切ることはできない。 // 初回のRomエミュレーション情報を使用 + s_isRomEmu = FALSE; if(HOTSWi_IsRomEmulation()){ + s_isRomEmu = TRUE; HOTSW_PutString("Read Emulation ROM\n"); s_cbData.cardType = ROM_EMULATION; s_cbData.gameCommondParam = s_cbData.pBootSegBuf->rh.s.game_cmd_param & ~SCRAMBLE_MASK; @@ -509,7 +512,7 @@ static HotSwState LoadCardData(void) } // ゲームモードに移行 - state = s_funcTable[s_debuggerFlg].ChangeMode_S(&s_cbData); + state = s_funcTable[s_isRomEmu].ChangeMode_S(&s_cbData); retval = (retval == HOTSW_SUCCESS) ? state : retval; // ---------------------- Game Mode ---------------------- @@ -659,14 +662,14 @@ static HotSwState ReadSecureModeCardData(void) u32 secure_ID; // PNG設定 - state = s_funcTable[s_debuggerFlg].SetPNG_S(&s_cbData); + state = s_funcTable[s_isRomEmu].SetPNG_S(&s_cbData); retval = (retval == HOTSW_SUCCESS) ? state : retval; // DS側符号生成回路初期値設定 (レジスタ設定) SetMCSCR(); // ID読み込み - state = s_funcTable[s_debuggerFlg].ReadID_S(&s_cbData); + state = s_funcTable[s_isRomEmu].ReadID_S(&s_cbData); retval = (retval == HOTSW_SUCCESS) ? state : retval; // カードIDの比較をして、一致しなければFALSEを返す @@ -677,7 +680,7 @@ static HotSwState ReadSecureModeCardData(void) if(retval == HOTSW_SUCCESS){ // Secure領域のSegment読み込み - state = s_funcTable[s_debuggerFlg].ReadSegment_S(&s_cbData); + state = s_funcTable[s_isRomEmu].ReadSegment_S(&s_cbData); retval = (retval == HOTSW_SUCCESS) ? state : retval; } @@ -1864,7 +1867,7 @@ static BOOL ChangeGameMode(void) state = ReadIDNormal(&s_cbData); state = ReadBootSegNormal(&s_cbData); - if(s_debuggerFlg){ + if(s_isRomEmu){ s_cbData.cardType = ROM_EMULATION; s_cbData.gameCommondParam = s_cbData.pBootSegBuf->rh.s.game_cmd_param & ~SCRAMBLE_MASK; } @@ -1882,9 +1885,9 @@ static BOOL ChangeGameMode(void) state = ChangeModeNormal(&s_cbData); // ---------------------- Secure Mode ---------------------- - state = s_funcTable[s_debuggerFlg].SetPNG_S(&s_cbData); + state = s_funcTable[s_isRomEmu].SetPNG_S(&s_cbData); SetMCSCR(); - state = s_funcTable[s_debuggerFlg].ChangeMode_S(&s_cbData); + state = s_funcTable[s_isRomEmu].ChangeMode_S(&s_cbData); // ---------------------- Game Mode ---------------------- state = ReadIDGame(&s_cbData);