From 98c39c49fc204c34adf7be9b3c632fce77659c54 Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 16 Apr 2009 12:47:45 +0000
Subject: [PATCH] =?UTF-8?q?NandInitializerProducton=E3=81=AB=E3=83=AA?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E5=A4=89=E6=9B=B4=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=99=E3=82=8B=E3=82=AA=E3=83=97?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0=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@2809 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9.TWL/Makefile                          |  5 +++++
 .../ARM9.TWL/include/process_hw_info.h         |  3 ++-
 .../NandInitializerRed/ARM9.TWL/src/main.c     | 18 ++++++++++++++++++
 .../ARM9.TWL/src/process_hw_info.c             |  3 +--
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile
index 6bb650dd..d4b72f6c 100644
--- a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile
+++ b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile
@@ -26,6 +26,10 @@
 MACRO_FLAGS				+=	-DAUTO_FORMAT_MODE
 #============================================================================
 #============================================================================
+# NandInitializer.iniで指定されたRegionと本体Regionが異なる場合実行を停止します。
+#MACRO_FLAGS				+=	-DREGION_LIMITATION
+#============================================================================
+#============================================================================
 # ワイヤレスの強制Disableフラグを設定可能にする場合定義します。（要:Make Clean）
 MACRO_FLAGS				+=	-DUSE_WIRELESS_FORCE_DISABLE_SETTING
 #============================================================================
@@ -84,6 +88,7 @@ SRCS		=	main.c \
 				process_write_data.c \
 				process_mcu.c \
 				process_wireless_setting.c \
+				process_error.c \
 				hwi.c \
 				debugger_hw_reset_control.c \
 				sort_title.c
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_hw_info.h b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_hw_info.h
index 82a20abb..01ee1293 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_hw_info.h
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_hw_info.h
@@ -33,9 +33,10 @@ extern "C" {
 //typedef void*  (*TpProcess)(void);
 
 /*---------------------------------------------------------------------------*
-    関数定義
+    関数宣言
  *---------------------------------------------------------------------------*/
 
+extern BOOL GetNandInitializerSetting(u8* region, u8* wireless, u8* logodemoskip);
 void* HWInfoProcess0(void);
 void* HWInfoProcess1(void);
 void* HWInfoProcess2(void);
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c
index 6778ab59..dca169a8 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c
@@ -29,6 +29,8 @@
 #include "keypad.h"
 #include "kami_pxi.h"
 #include "process_fade.h"
+#include "process_hw_info.h"
+#include "process_error.h"
 #include "hwi.h"
 
 #define SCRAMBLE_MASK 0x00406000
@@ -173,6 +175,22 @@ TwlMain()
 	}
 #endif
 
+#ifdef    REGION_LIMITATION
+{
+	static u8 tempRegion;
+	static u8 tempWireless;
+	static u8 tempLogodemoskip;
+	BOOL result;
+	
+	result = GetNandInitializerSetting(&tempRegion, &tempWireless, &tempLogodemoskip);
+	
+	if (!result || OS_GetRegion() != tempRegion)
+	{
+		sProcess = errorProcess;
+	}
+}
+#endif // REGION_LIMITATION
+
     while (1)
     {
 		kamiPadRead();
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
index c26e7bab..450c8ff5 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c
@@ -80,7 +80,6 @@ static BOOL sLogoDemoSkipForce;
 static BOOL WriteHWNormalInfoFile( void );
 static BOOL WriteHWSecureInfoFile( u8 region );
 //static BOOL DeleteHWInfoFile( void );
-static BOOL GetNandInitializerSetting(u8* region, u8* wireless, u8* logodemoskip);
 
 /*---------------------------------------------------------------------------*
     プロセス関数定義
@@ -394,7 +393,7 @@ static BOOL DeleteHWInfoFile( void )
 
   Returns:      None.
  *---------------------------------------------------------------------------*/
-static BOOL GetNandInitializerSetting(u8* region, u8* wireless, u8* logodemoskip)
+BOOL GetNandInitializerSetting(u8* region, u8* wireless, u8* logodemoskip)
 {
     FSFile  file;	
     BOOL    open_is_ok;