From 8af9d2d1adf5f1457c6676314d146fc6536f0f80 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 1 May 2009 05:08:46 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=83=97=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92?=
 =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E5=8B=95?=
 =?UTF-8?q?=E4=BD=9C=E6=99=82=E3=81=AE=E3=81=BF=E8=A1=8C=E3=81=86=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E5=A4=89=E6=9B=B4=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@2812 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/util/ARM9/Makefile |  1 +
 include/sysmenu/util.h                     | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build/libraries_sysmenu/util/ARM9/Makefile b/build/libraries_sysmenu/util/ARM9/Makefile
index f4606902..6617cdae 100644
--- a/build/libraries_sysmenu/util/ARM9/Makefile
+++ b/build/libraries_sysmenu/util/ARM9/Makefile
@@ -39,6 +39,7 @@ INSTALL_TARGETS	=	$(TARGETS)
 INSTALL_DIR		=	$(SYSMENU_INSTALL_LIBDIR)
 
 LINCLUDES		=	$(ROOT)/build/libraries/spi/ARM9/include	\
+					$(SYSMENU_ROOT)/build/libraries_sysmenu/sysmenu/common/include
 
 #----------------------------------------------------------------------------
 
diff --git a/include/sysmenu/util.h b/include/sysmenu/util.h
index 97144994..a20a68c4 100644
--- a/include/sysmenu/util.h
+++ b/include/sysmenu/util.h
@@ -20,6 +20,9 @@
 
 #include <twl.h>
 #include <twl/os/common/format_rom.h>
+#ifdef SYSM_BUILD_FOR_DEBUGGER
+#include <sysmenu/sysmenu_lib/common/sysmenu_work.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -133,10 +136,12 @@ static inline BOOL UTL_CheckAppRegion( u32 card_region_bitmap )
 {
 #ifdef SYSM_BUILD_FOR_DEBUGGER
 #pragma unused(card_region_bitmap)
-    return TRUE;
-#else
-    return ( card_region_bitmap & ( 0x00000001 << OS_GetRegion() ) ) ? TRUE : FALSE;
+	// デバッガ動作時のみ、リージョンチェックを無効にする。
+	if( SYSM_IsRunOnDebugger() ) {
+		return TRUE;
+	}
 #endif
+    return ( card_region_bitmap & ( 0x00000001 << OS_GetRegion() ) ) ? TRUE : FALSE;
 }
 
 // CRCチェック