From ce67c0b18ad0497cb749383b35db58c118c818e4 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 23 May 2008 09:51:02 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4?=
 =?UTF-8?q?=E3=83=83=E3=83=81AUTH=5FNTR=5FCARD=5FPRODUCT=5FONLY=E3=81=A7NT?=
 =?UTF-8?q?R=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AE=E6=A4=9C=E8=A8=BC?=
 =?UTF-8?q?=E3=82=92=E3=83=9C=E3=83=B3=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B30=E3=81=AE?=
 =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=81=AE=E3=81=BF=E3=81=AB=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=8B=E3=80=81=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E6=8E=A5?=
 =?UTF-8?q?=E7=B6=9A=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=81=A8?=
 =?UTF-8?q?=E3=81=8D=E3=81=AE=E3=81=BF=E3=81=AB=E3=81=99=E3=82=8B=E3=81=8B?=
 =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
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@1499 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/sysmenu/ARM9/Makefile    |  4 ++++
 build/libraries_sysmenu/sysmenu/ARM9/src/title.c | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile
index 8738dbb6..2a4d988f 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile
+++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile
@@ -50,6 +50,10 @@ ifneq ($(DHT_TEST),)
 MACRO_FLAGS		+=	-DDHT_TEST
 endif
 
+ifneq ($(AUTH_NTR_CARD_PRODUCT_ONLY),)
+MACRO_FLAGS     +=  -DAUTH_NTR_CARD_PRODUCT_ONLY
+endif
+
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS	=	$(TARGETS)
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
index 5713855a..7b878778 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
@@ -1211,8 +1211,13 @@ static AuthResult SYSMi_AuthenticateNTRCardAppHeader( TitleProperty *pBootTitle,
 {
 	AuthResult ret = AUTH_RESULT_SUCCEEDED;
 
-	// ボンディングオプション00にだけ適用
+	// ボンディングオプション00でないときは適用しない
+#ifdef AUTH_NTR_CARD_PRODUCT_ONLY
 	if( !SCFG_GetBondingOption() == 0 )
+#else
+	// デバッガに接続してるときは適用しない
+	if( SYSM_IsRunOnDebugger() )
+#endif
 	{
 		return AUTH_RESULT_SUCCEEDED;
 	}
@@ -1258,8 +1263,13 @@ static AuthResult SYSMi_AuthenticateNTRCardTitle( TitleProperty *pBootTitle)
 	SVCHMACSHA1Context ctx;
 	ROM_Header_Short *hs = ( ROM_Header_Short *)SYSM_APP_ROM_HEADER_BUF;
 
-	// ボンディングオプション00にだけ適用
+	// ボンディングオプション00でないときは適用しない
+#ifdef AUTH_NTR_CARD_PRODUCT_ONLY
 	if( !SCFG_GetBondingOption() == 0 )
+#else
+	// デバッガに接続してるときは適用しない
+	if( SYSM_IsRunOnDebugger() )
+#endif
 	{
 		return AUTH_RESULT_SUCCEEDED;
 	}