From 44f4b81bdf7abd81460cb1cf74b5a99b2054fa59 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 26 Mar 2008 09:34:40 +0000
Subject: [PATCH] =?UTF-8?q?OSFromFirmBuf=E3=81=A8OSFromBromBuf=E3=81=AE?=
 =?UTF-8?q?=E5=B7=AE=E5=88=86=E3=81=AFNAND=E3=83=95=E3=82=A1=E3=83=BC?=
 =?UTF-8?q?=E3=83=A0=E3=81=A7=E6=B6=88=E5=8E=BB=E3=81=97=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AA=E3=81=AE=E3=81=A7OSFromFir?=
 =?UTF-8?q?mBuf=E3=81=AE=E3=82=AF=E3=83=AA=E3=82=A2=E3=81=A7=E7=B5=B1?=
 =?UTF-8?q?=E4=B8=80=E3=80=82=20=E3=83=93=E3=83=AB=E3=83=89=E3=81=8C?=
 =?UTF-8?q?=E9=80=9A=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=82=AF=E3=83=AB=E3=83=BC=E3=83=89=E3=83=98=E3=83=83=E3=83=80?=
 =?UTF-8?q?=E3=82=92=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@963 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 6 +++---
 build/libraries_sysmenu/boot/ARM9/src/bootAPI.c | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index cc872c8e..f73b1c02 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -23,7 +23,7 @@
 #include <sysmenu/hotsw.h>
 #include <sysmenu/ds.h>
 #include <firm/hw/ARM7/mmap_firm.h>
-#include <firm/format/from_brom.h>
+#include <firm/format/from_firm.h>
 #include <firm/aes/ARM7/aes_init.h>
 #include <firm/os/common/boot.h>
 #include "reboot.h"
@@ -198,8 +198,8 @@ BOOL BOOT_WaitStart( void )
 			
 			// 鍵は不要になるので、消しておく
 			{
-				OSFromFirm7Buf* fromFirm = (void*)HW_FIRM_FROM_FIRM_BUF;
-				MI_CpuClearFast(fromFirm, sizeof(OSFromFirm7Buf));
+				OSFromFirmBuf* fromFirm = (void*)HW_FIRM_FROM_FIRM_BUF;
+				MI_CpuClearFast(fromFirm, sizeof(OSFromFirmBuf));
 			}
 		}
 		// SDK共通リブート
diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
index 57cf9a0f..7eb0e683 100644
--- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
@@ -23,7 +23,7 @@
 #include <sysmenu/ds.h>
 #include <firm/format/wram_regs.h>
 #include <firm/hw/ARM9/mmap_firm.h>
-#include <firm/format/from_brom.h>
+#include <firm/format/from_firm.h>
 #include "reboot.h"
 
 
@@ -190,7 +190,8 @@ void BOOT_Ready( void )
 
 		// 鍵は不要になるので、消しておく
 		{
-			MI_CpuClearFast((void*)HW_FIRM_FROM_BROM_BUF, HW_FIRM_FROM_BROM_BUF_SIZE);
+			OSFromFirmBuf* fromFirm = (void*)HW_FIRM_FROM_FIRM_BUF;
+			MI_CpuClearFast(fromFirm, sizeof(OSFromFirmBuf));
 		}
 
 		// 起動するターゲットの種類を指定する必要あり