From 5e806507f26c97c926869c02526a641fc2e650be Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 20 Aug 2008 09:37:15 +0000
Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0=EF=BC=9AAkabane=20Jumpei)?=
 =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E3=81=A7=E3=83=AA=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E9=81=95=E3=81=84=E3=81=AE=E3=82=A2?=
 =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=92=E8=AA=AD=E3=82=93=E3=81=A0=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=80=81=E6=AD=A3=E5=B8=B8=E3=81=AB=E5=8B=95=E4=BD=9C?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
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@2204 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 853d89b1..7f9645ae 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -433,9 +433,14 @@ static HotSwState LoadCardData(void)
 			}
 
             if(s_cbData.pBootSegBuf->rh.s.platform_code & PLATFORM_CODE_FLAG_TWL){
-				// リージョンチェック
-				if( !UTL_CheckAppRegion( s_cbData.pBootSegBuf->rh.s.card_region_bitmap ) ) {
-					retval = (retval == HOTSW_SUCCESS) ? HOWSW_REGION_CHECK_ERROR : retval;
+                // デバッガでリージョン違いのアプリを読んだ場合、正常に動作しなくなるのを回避するため
+				u64 card_title_id = s_cbData.pBootSegBuf->rh.s.titleID;
+				u64 my_title_id   = ((ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF)->titleID;
+				if(!s_debuggerFlg || card_title_id != my_title_id){
+          		// リージョンチェック
+					if( !UTL_CheckAppRegion( s_cbData.pBootSegBuf->rh.s.card_region_bitmap ) ) {
+						retval = (retval == HOTSW_SUCCESS) ? HOWSW_REGION_CHECK_ERROR : retval;
+					}
 				}
 
                 s_cbData.twlFlg = TRUE;