From 590e95e87b19a666b99c3426ae803c386ec1456b Mon Sep 17 00:00:00 2001 From: nakasima Date: Fri, 20 Jun 2008 06:26:46 +0000 Subject: [PATCH] =?UTF-8?q?TWL=E3=82=AB=E3=83=BC=E3=83=89=E3=82=A8?= =?UTF-8?q?=E3=83=9F=E3=83=A5=E3=83=AC=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=99=82=EF=BC=88=E3=82=AB=E3=83=BC=E3=83=89ID=E3=81=AETWL?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=83=95=E3=83=A9=E3=82=B0=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=EF=BC=89=E3=81=AESECURE2=E3=83=AD=E3=83=BC=E3=83=89?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E4=BF=AE=E6=AD=A3=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@1667 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/src/romEmulation.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/romEmulation.c b/build/libraries_sysmenu/hotsw/ARM7/src/romEmulation.c index f8546a32..396346f0 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/romEmulation.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/romEmulation.c @@ -102,8 +102,11 @@ HotSwState ReadIDSecure_ROMEMU(CardBootData *cbd) *---------------------------------------------------------------------------*/ HotSwState ReadSegSecure_ROMEMU(CardBootData *cbd) { + u32 *buf = (cbd->modeType == HOTSW_MODE1) ? cbd->pSecureSegBuf : cbd->pSecure2SegBuf; u32 i,j=0; - u64 page = 0x20; + u32 keyTable2Adr = (u32)cbd->pBootSegBuf->rh.s.twl_card_keytable_area_rom_offset * TWLCARD_BORDER_OFFSET; + u32 Secure2Adr = (cbd->modeType == HOTSW_MODE1) ? HOTSW_SECURE_AREA_OFS : (keyTable2Adr + HOTSW_SECURE2_AREA_OFS); + u64 page = Secure2Adr/HOTSW_PAGE_SIZE; GCDCmd64 cndLE; u32 n = 0; @@ -114,9 +117,9 @@ HotSwState ReadSegSecure_ROMEMU(CardBootData *cbd) #ifdef USE_NEW_DMA // NewDMA転送の準備 - HOTSW_NDmaCopy_Card( HOTSW_NDMA_NO, (u32 *)HOTSW_MCD1, (u32 *)cbd->pSecureSegBuf + (u32)(PAGE_WORD_SIZE*i), PAGE_SIZE ); + HOTSW_NDmaCopy_Card( HOTSW_NDMA_NO, (u32 *)HOTSW_MCD1, buf + (u32)(PAGE_WORD_SIZE*i), PAGE_SIZE ); #else - HOTSW_DmaCopy32_Card( HOTSW_DMA_NO, (u32 *)HOTSW_MCD1, (u32 *)cbd->pSecureSegBuf + (u32)(PAGE_WORD_SIZE*i), PAGE_SIZE ); + HOTSW_DmaCopy32_Card( HOTSW_DMA_NO, (u32 *)HOTSW_MCD1, buf + (u32)(PAGE_WORD_SIZE*i), PAGE_SIZE ); #endif // リトルエンディアンで作って