From f42aa9902d15caf20625c90828d5937e41a8d43c Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 18 Apr 2008 07:54:48 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=82=92=E3=83=8F=E3=83=BC=E3=83=89=E3=83=AA?=
 =?UTF-8?q?=E3=82=BB=E3=83=83=E3=83=88=E6=99=82=E3=81=AB=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E9=A0=98=E5=9F=9F=E3=81=B8=E7=A7=BB?=
 =?UTF-8?q?=E5=8B=95=E3=80=82=20=E8=A3=BD=E5=93=81CPU=E3=81=A7=E3=81=AF?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E3=81=AB=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@1187 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ImportJump/ARM9.TWL/include/ImportJump.h               | 3 ++-
 build/systemMenu_RED/ImportJump/ARM9.TWL/main.rsf          | 2 +-
 build/systemMenu_RED/ImportJump/ARM9.TWL/src/import.c      | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build/systemMenu_RED/ImportJump/ARM9.TWL/include/ImportJump.h b/build/systemMenu_RED/ImportJump/ARM9.TWL/include/ImportJump.h
index df6e3964..b486a100 100644
--- a/build/systemMenu_RED/ImportJump/ARM9.TWL/include/ImportJump.h
+++ b/build/systemMenu_RED/ImportJump/ARM9.TWL/include/ImportJump.h
@@ -52,7 +52,8 @@ typedef struct _ImportJumpSetting
 
 inline ImportJump* GetImportJumpSetting(void)
 {
-	return (ImportJump *)0x0deffc00;
+	// リセット後は各PSRAMの先頭8MBしか保証されない
+	return (ImportJump *)HW_TWL_MAIN_MEM_EX;
 }
 
 /*===========================================================================*/
diff --git a/build/systemMenu_RED/ImportJump/ARM9.TWL/main.rsf b/build/systemMenu_RED/ImportJump/ARM9.TWL/main.rsf
index efa7b118..ca9d017a 100644
--- a/build/systemMenu_RED/ImportJump/ARM9.TWL/main.rsf
+++ b/build/systemMenu_RED/ImportJump/ARM9.TWL/main.rsf
@@ -154,7 +154,7 @@ Property
 	#
 	# DisableDebug	：最終ROMではデバッグできないようにTRUEにする必要があります。
 	#
-#	DisableDebug	TRUE
+	DisableDebug	TRUE
 
 	###
 	#### END
diff --git a/build/systemMenu_RED/ImportJump/ARM9.TWL/src/import.c b/build/systemMenu_RED/ImportJump/ARM9.TWL/src/import.c
index 41660b81..0823e317 100644
--- a/build/systemMenu_RED/ImportJump/ARM9.TWL/src/import.c
+++ b/build/systemMenu_RED/ImportJump/ARM9.TWL/src/import.c
@@ -80,6 +80,13 @@ BOOL kamiImportTad(NAMTitleId* pTitleID)
 	char savePrivatePath[FS_ENTRY_LONGNAME_MAX];
 	char subBannerPath[FS_ENTRY_LONGNAME_MAX];
 
+	// 製品用CPUではインポート不可に
+	if ( !((*(u8*)(OS_CHIPTYPE_DEBUGGER_ADDR) & OS_CHIPTYPE_DEBUGGER_MASK)) )
+	{
+		OS_Warning(" Fail : Production CPU\n");
+		return FALSE;
+    }
+
 	// ファイル初期化
 	FS_InitFile(&file);