From 4445f7e12e41d458d7307a2f8ee9a9832b9118e0 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 28 Apr 2009 00:16:26 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E9=9F=93=E3=83=AA=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9?=
 =?UTF-8?q?=E3=82=A4=E3=83=83=E3=83=81=E3=81=A7=E9=81=B8=E6=8A=9E=E7=84=A1?=
 =?UTF-8?q?=E5=8A=B9=E3=81=AB=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=20=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E6=95=B0=E5=AD=97=E3=82=921.3=E3=81=AB?=
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@2811 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../SystemUpdaterRegionSelect/ARM9.TWL/Makefile | 13 +++++++++++--
 .../ARM9.TWL/include/kami_global.h              |  2 +-
 .../ARM9.TWL/src/process_select_region.c        | 17 ++++++++++++++---
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile
index 51fb67d1..d57914a5 100644
--- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile
+++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile
@@ -16,16 +16,21 @@
 # $Author$
 #----------------------------------------------------------------------------
 
+#TWL_NANDAPP = TRUE
+
 #============================================================================
 #製品鍵を使った書き込みを行う場合は、TwlIPL/build/buildtools/commondefsの"FIRM_USE_PRODUCT_KEYS=TRUE"を有効にしてください。
 #============================================================================
 
 # SystemMenuファイルの置かれているフォルダを指定(相対もしくは絶対）
-UPDATER_HOST_ROOT_DIR = ./v1_2
+UPDATER_HOST_ROOT_DIR = ./v1_3
 
 # JPリージョンしか選択できなくする場合はTRUEを指定
 JP_REGION_ONLY			?= FALSE
 
+# 中韓リージョンを選択できなくする場合はTRUEを指定
+DISABLE_CK_REGION		?= TRUE
+
 # COMPILE SWITCH for build SystemUpdater（TRUEにすると、ダミーdev.kpを生成しないようになります。）
 FOR_LOTCHECK			?=	FALSE
 
@@ -120,6 +125,10 @@ ifeq ($(JP_REGION_ONLY),TRUE)
 MACRO_FLAGS += -DJP_REGION_ONLY
 endif
 
+ifeq ($(DISABLE_CK_REGION),TRUE)
+MACRO_FLAGS += -DDISABLE_CK_REGION
+endif
+
 ifeq ($(FOR_LOTCHECK),TRUE)
 MACRO_FLAGS += -DFOR_LOTCHECK
 endif
@@ -146,7 +155,7 @@ MAKEROM_FLAGS			+=	-DTITLEID_LO='$(TITLEID_LO)' \
 							-DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)' \
 							-DUPDATER_HOST_ROOT_DIR='$(UPDATER_HOST_ROOT_DIR)'
 
-MAKETAD_FLAGS			+=	-s
+MAKETAD_OPTION			+=	-s
 
 SYSMENU_LIBS			=	\
 							libnamut$(TWL_LIBSUFFIX).a \
diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h
index 423a0429..c368c02e 100644
--- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h
+++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/include/kami_global.h
@@ -47,7 +47,7 @@ typedef enum
     定数定義
  *---------------------------------------------------------------------------*/
 
-#define SYSTEM_UPDATER_NAME         L"SystemUpdater ver.1.2"
+#define SYSTEM_UPDATER_NAME         L"SystemUpdater ver.1.3"
 #define SYSTEM_UPDATER_LOG_PATH     "nand:/sys/log/updater.log"
 #define SYSTEM_UPDATER_MAGIC_CODE   44001111
 
diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c
index 06e8cc8d..12bd5f77 100644
--- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c
+++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_select_region.c
@@ -23,6 +23,12 @@
 #include "debugger_hw_reset_control.h"
 #include "debugger_card_rom.h"
 
+#ifdef DISABLE_CK_REGION
+#define    SELECT_MAX             OS_TWL_REGION_CHINA
+#else
+#define    SELECT_MAX             OS_TWL_REGION_MAX
+#endif
+
 /*---------------------------------------------------------------------------*
     型定義
  *---------------------------------------------------------------------------*/
@@ -114,6 +120,11 @@ void ProcessSelectRegion(void)
 
 #ifndef JP_REGION_ONLY
 	gRegion = OS_GetRegion();
+	// 中韓リージョンの本体に中韓非対応 Updater を使うと飛び越えるので対応
+	if (gRegion >= SELECT_MAX)
+	{
+		gRegion = OS_TWL_REGION_JAPAN;
+	}
 #endif // JP_REGION_ONLY
 
 	while(1)
@@ -140,7 +151,7 @@ void ProcessSelectRegion(void)
 #ifndef JP_REGION_ONLY
 			if (kamiPadIsRepeatTrigger(PAD_KEY_DOWN))
 			{
-				if (++gRegion >= OS_TWL_REGION_MAX)
+				if (++gRegion >= SELECT_MAX)
 				{
 					gRegion = OS_TWL_REGION_JAPAN;
 				}
@@ -149,7 +160,7 @@ void ProcessSelectRegion(void)
 			{
 				if (--gRegion < OS_TWL_REGION_JAPAN)
 				{
-					gRegion = (OSTWLRegion)(OS_TWL_REGION_MAX-1);
+					gRegion = (OSTWLRegion)(SELECT_MAX-1);
 				}
 			}
 #endif // JP_REGION_ONLY
@@ -170,7 +181,7 @@ void ProcessSelectRegion(void)
 #endif
 
 #ifndef JP_REGION_ONLY
-		for (i=0;i<OS_TWL_REGION_MAX;i++)
+		for (i=0;i<SELECT_MAX;i++)
 		{
 			if (gRegion != i)
 			{