From acca64f145304596669a9bd33c18ac046d458b78 Mon Sep 17 00:00:00 2001 From: nakasima Date: Fri, 20 Jun 2008 12:29:45 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=82=B9=E3=83=86?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=82=B9=E3=83=AA=E3=83=BC=E3=83=89=E3=81=AE?= =?UTF-8?q?=E9=AB=98=E9=80=9F=E5=8C=96=EF=BC=88SDK=E5=90=8C=E6=A7=98?= =?UTF-8?q?=E3=81=AB=E3=83=AC=E3=82=A4=E3=83=86=E3=83=B3=E3=82=B72?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E4=BD=BF=E7=94=A8=EF=BC=89=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@1670 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c | 8 ++++---- build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c index d2183cdd..c1070df2 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c @@ -230,7 +230,7 @@ HotSwState ReadStatusNormal(CardBootData *cbd) #endif // MCCNT1 レジスタ設定 - reg_HOTSW_MCCNT1 = (cbd->gameCommondParam & ~SCRAMBLE_MASK) | START_MASK | HOTSW_PAGE_STAT; + reg_HOTSW_MCCNT1 = (cbd->gameCommondParam & ~(SCRAMBLE_MASK | LATENCY1_MASK)) | START_MASK | HOTSW_PAGE_STAT; // メッセージ受信 OS_ReceiveMessage(&HotSwThreadData.hotswDmaQueue, (OSMessage *)&s_Msg, OS_MESSAGE_BLOCK); @@ -262,7 +262,7 @@ HotSwState RefreshBadBlockNormal(CardBootData *cbd) reg_HOTSW_MCCNT0 = (u16)((reg_HOTSW_MCCNT0 & HOTSW_E2PROM_CTRL_MASK) | REG_MI_MCCNT0_E_MASK ); // MCCNT1 レジスタ設定 - reg_HOTSW_MCCNT1 = (cbd->gameCommondParam & ~SCRAMBLE_MASK) | START_MASK | HOTSW_PAGE_0; + reg_HOTSW_MCCNT1 = (cbd->gameCommondParam & ~(SCRAMBLE_MASK | LATENCY1_MASK)) | START_MASK | HOTSW_PAGE_0; // カードデータ転送終了まで待つ HOTSW_WaitCardCtrl(); @@ -891,7 +891,7 @@ HotSwState ReadStatusGame(CardBootData *cbd) #endif // MCCNT1 レジスタ設定 (START = 1 W/R = 0 PC = 111(ステータスリード) その他Romヘッダの情報におまかせ) - reg_HOTSW_MCCNT1 = cbd->gameCommondParam | START_MASK | HOTSW_PAGE_STAT; + reg_HOTSW_MCCNT1 = (cbd->gameCommondParam & ~LATENCY1_MASK) | START_MASK | HOTSW_PAGE_STAT; // メッセージ受信 OS_ReceiveMessage(&HotSwThreadData.hotswDmaQueue, (OSMessage *)&s_Msg, OS_MESSAGE_BLOCK); @@ -923,7 +923,7 @@ HotSwState RefreshBadBlockGame(CardBootData *cbd) reg_HOTSW_MCCNT0 = (u16)((reg_HOTSW_MCCNT0 & HOTSW_E2PROM_CTRL_MASK) | REG_MI_MCCNT0_E_MASK ); // MCCNT1 レジスタ設定 - reg_HOTSW_MCCNT1 = cbd->gameCommondParam | START_MASK | HOTSW_PAGE_0; + reg_HOTSW_MCCNT1 = (cbd->gameCommondParam & ~LATENCY1_MASK) | START_MASK | HOTSW_PAGE_0; // カードデータ転送終了まで待つ HOTSW_WaitCardCtrl(); diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index 1ce0f992..1f5095d1 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -709,6 +709,7 @@ HotSwState HOTSWi_RefreshBadBlock(u32 romMode) { break; } + OS_Sleep(1); } } }