From 0ed02f72b998ceb16da0bc2f8d40e17b1fc477cd Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff> Date: Tue, 29 Jan 2008 11:18:27 +0000 Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0:Akabane=20Jumpei)=20Boot=20?= =?UTF-8?q?Segment=E8=AA=AD=E3=81=BF=E3=81=AE=E3=83=AC=E3=82=A4=E3=83=86?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=82=92=E4=BF=AE=E6=AD=A3(Latency1=3D0x1fff?= =?UTF-8?q?=20=20Latency2=3D0x3f)=20DS=E3=82=AB=E3=83=BC=E3=83=89=E3=82=92?= =?UTF-8?q?=E8=AA=AD=E3=82=93=E3=81=A0=E5=A0=B4=E5=90=88=E3=81=AF=E3=80=81?= =?UTF-8?q?RomHeader=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=81=AE=E5=85=88?= =?UTF-8?q?=E9=A0=AD1=E3=83=9A=E3=83=BC=E3=82=B8=E5=88=86=E4=BB=A5?= =?UTF-8?q?=E9=99=8D=E3=81=AF=E3=82=BC=E3=83=AD=E3=82=AF=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F=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@541 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c | 12 +++++++----- build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c | 12 +++++++----- build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 4 ++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c index aea01e6f..40466b1f 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType1.c @@ -28,9 +28,11 @@ static void SetMCSCR(void); // 共通 /*---------------------------------------------------------------------------* - Name: ReadBootSegNormal_DSType1 - - Description: DSカードType1のノーマルモードのBoot Segment読み込み + * Name: ReadBootSegNormal_DSType1 + * + * Description: DSカードType1のノーマルモードのBoot Segment読み込み + * + * CT=240ns Latency1=0x1fff Latency2=0x3f Pagecount=8page *---------------------------------------------------------------------------*/ void ReadBootSegNormal_DSType1(CardBootData *cbd) { @@ -44,8 +46,8 @@ void ReadBootSegNormal_DSType1(CardBootData *cbd) // MCCNT0 レジスタ設定 (E = 1 I = 1 SEL = 0に) reg_HOTSW_MCCNT0 = (u16)((reg_HOTSW_MCCNT0 & 0x0fff) | 0xc000); - // MCCNT1 レジスタ設定 (START = 1 PC = 100(8ページリード)に latency1 = 0x14) - reg_HOTSW_MCCNT1 = START_MASK | PC_MASK & (0x4 << PC_SHIFT) | (0x14 & LATENCY1_MASK); + // MCCNT1 レジスタ設定 + reg_HOTSW_MCCNT1 = START_MASK | CT_MASK | PC_MASK & (0x4 << PC_SHIFT) | LATENCY2_MASK | LATENCY1_MASK; // カードデータ転送終了割り込みが起こるまで寝る(割り込みハンドラの中で起こされる) OS_SleepThread(NULL); diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c index 1e854076..e62ba7ff 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardType2.c @@ -33,9 +33,11 @@ static void SetMCSCR(void); // 共通 /*---------------------------------------------------------------------------* - Name: ReadBootSegNormal_DSType2 - - Description: DSカードType1のノーマルモードのBoot Segment読み込み (Page0 〜 7) + * Name: ReadBootSegNormal_DSType2 + * + * Description: DSカードType2のノーマルモードのBoot Segment読み込み (Page0 〜 7) + * + * CT=240ns Latency1=0x1fff Latency2=0x3f Pagecount=1page *---------------------------------------------------------------------------*/ void ReadBootSegNormal_DSType2(CardBootData *cbd) { @@ -69,8 +71,8 @@ void ReadBootSegNormal_DSType2(CardBootData *cbd) reg_HOTSW_MCCMD0 = *(u32 *)cndBE.b; reg_HOTSW_MCCMD1 = *(u32 *)&cndBE.b[4]; - // MCCNT1 レジスタ設定 (START = 1 PC = 001(1ページリード)に latency1 = 0x5fe) - reg_HOTSW_MCCNT1 = START_MASK | PC_MASK & (0x1 << PC_SHIFT) | (0x5fe & LATENCY1_MASK); + // MCCNT1 レジスタ設定 + reg_HOTSW_MCCNT1 = START_MASK | CT_MASK | PC_MASK & (0x1 << PC_SHIFT) | LATENCY2_MASK | LATENCY1_MASK; // カードデータ転送終了割り込みが起こるまで寝る(割り込みハンドラの中で起こされる) OS_SleepThread(NULL); diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index 1d2e73ec..5ea0312e 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -310,6 +310,10 @@ BOOL HOTSW_Boot(void) OS_TPrintf("TWL Card.\n"); s_cbData.twlFlg = TRUE; } + else{ + // NTRカードの場合はRomHeaderバッファの1ページ目以降をクリアしておく。 + MI_CpuClearFast((void *)(SYSM_CARD_ROM_HEADER_BAK + PAGE_SIZE), SYSM_CARD_ROM_HEADER_SIZE - PAGE_SIZE); + } // SecureコマンドのPNG_ONコマンドetc用のレイテンシを求める(Latency1とLatency2を足す) s_cbData.secureLatency = AddLatency2ToLatency1(s_cbData.pBootSegBuf->rh.s.secure_cmd_param);