(佐々木@PSEG1)リージョンの指定ができるように変更

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2242 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/tests/CustomSystemUpdater/ARM9.TWL/main.rsf

@@ -222,7 +222,7 @@ RomSpec
 	Segment		ALL
 	HostRoot	../data
 	Root		/data
-	File		HNAA.tad HNBA.tad HNCA.tad HNLA.tad HNHA.tad TWLFontTable.dat menu_launcher.nand
+	File		hnaj-v0.tad hnbj-v0.tad hnca-v0.tad hnda-v0.tad hnea-v0.tad hnfj-v0.tad HNGJ-261.tad hnha-v0.tad hnij-v0.tad hnjj-v0.tad hnkj-v0.tad hnla-v0.tad TWLFontTable.dat nandfirm_rcplus.nand
 	HostRoot	$(PRIVKEY_PATH)
 	Root		/key
 	File		$(HWINFO_PRIVKEY) $(HWID_PRIVKEY)

build/tests/CustomSystemUpdater/ARM9.TWL/src/main.c

@@ -62,7 +62,7 @@ typedef struct _CopyFileList
  *---------------------------------------------------------------------------*/
 
 #define SYSTEM_UPDATER_LOG_PATH     "nand:/sys/log/updater.log"
-#define NAND_FIRM_PATH_IN_ROM       "rom:/data/menu_launcher.nand"
+#define NAND_FIRM_PATH_IN_ROM       "rom:/data/nandfirm_rcplus.nand"
 
 #define SYSTEM_UPDATER_MAGIC_CODE   44001111
 
@@ -71,11 +71,18 @@ typedef struct _CopyFileList
 
 static const char* ImportTadFileList[] =
 {
-	"rom:/data/HNAA.tad", 
-	"rom:/data/HNBA.tad", 
-	"rom:/data/HNCA.tad", 
-	"rom:/data/HNLA.tad", 
-	"rom:/data/HNHA.tad", 
+	"rom:/data/hnaj-v0.tad", 
+	"rom:/data/hnbj-v0.tad", 
+	"rom:/data/hnca-v0.tad", 
+	"rom:/data/hnda-v0.tad", 
+	"rom:/data/hnea-v0.tad", 
+	"rom:/data/hnfj-v0.tad", 
+	"rom:/data/HNGJ-261.tad", 
+	"rom:/data/hnha-v0.tad", 
+	"rom:/data/hnij-v0.tad", 
+	"rom:/data/hnjj-v0.tad", 
+	"rom:/data/hnkj-v0.tad", 
+	"rom:/data/hnla-v0.tad", 
 
 };
 
@@ -349,6 +356,9 @@ TwlMain()
 
 	result = TRUE;
 
+    // Š®‘S‚É<E2809A>Á‹Ž
+    NAMUT_Format();
+    
 	// フォーマット実行
 	sIsFormatFinish = FALSE;
     ExeFormatAsync(FORMAT_MODE_QUICK, FormatCallback);
@@ -372,7 +382,7 @@ TwlMain()
 	// 全ハードウェア情報の更新
 	for (i=0;i<MAX_RETRY_COUNT;i++)
 	{
-		hw_info_result = WriteHWInfoFile(OS_GetRegion(), OS_IsForceDisableWireless());
+		hw_info_result = WriteHWInfoFile(OS_TWL_REGION_EUROPE, OS_IsForceDisableWireless());
 		if (hw_info_result)
 		{
 			kamiFontPrintf( 0, printLine++, FONT_COLOR_GREEN, "Write Hardware Info Success.");			
@@ -757,4 +767,4 @@ static void FormatCallback(KAMIResult result, void* /*arg*/)
 	}
 
 	sIsFormatFinish = TRUE;
-}
+}

build/tests/CustomSystemUpdater/custom_base.yaml

@@ -7,3 +7,4 @@
 :TadFiles: 
 :SRC: ARM9.TWL/src/main.c
 :FontFile: TWLFontTable.dat
+:Region: EUR

build/tests/CustomSystemUpdater/sumaker.rb

@@ -24,6 +24,13 @@ CUSTOM_CONFIG = "custom.yaml"
 
 FILE_MATCH = /[a-zA-Z0-9\-_\.]+\z/
 
+REGION = {
+    "JPN" => "OS_TWL_REGION_JAPAN",
+    "EUR" => "OS_TWL_REGION_EUROPE",
+    "AUS" => "OS_TWL_REGION_AMERICA",
+    "USA" => "OS_TWL_REGION_AUSTRALIA",
+}
+
 # デフォルト設定の作成
 def make_default_config
     config = {
@@ -41,6 +48,7 @@ def make_default_config
         :RSF => "ARM9.TWL/main.rsf",
         :SRC => "ARM9.TWL/src/main.c",
         :DataPath => "data",
+        :Region => "JPN",
     }
     write_config(DEFAULT_CONFIG, config)
     
@@ -103,6 +111,10 @@ def make_main(config)
     mod = replace_data(src, "tadlist", data)
     mod = replace_data(mod, "nandfirm", config[:NandFirm])
     mod = replace_data(mod, "fontfile", config[:FontFile])
+    
+    # region
+    region = (REGION[config[:Region]] != nil) ? REGION[config[:Region]] : REGION["JPN"] 
+    mod = replace_data(mod, "region", region)
     write_data(config[:TargetPath] + "/" + config[:SRC], mod)    
 end
 
@@ -141,9 +153,8 @@ when "custom" then
     # dataディレクトリ内のtadを追加する
     config = ""
     if ARGV.size == 1
-        # コンフィグファイルが指定されてない場合デフォルトをベースに
-        make_default_config
-        config = DEFAULT_CONFIG
+        # コンフィグファイルが指定されてない場合config_baseをベースに
+        config = "custom_base.yaml"
     else
         config = ARGV[1]
     end

build/tests/CustomSystemUpdater/template/ARM9.TWL/src/main.c

@@ -344,6 +344,9 @@ TwlMain()
 
 	result = TRUE;
 
+    // 完全に消去
+    NAMUT_Format();
+    
 	// フォーマット実行
 	sIsFormatFinish = FALSE;
     ExeFormatAsync(FORMAT_MODE_QUICK, FormatCallback);
@@ -367,7 +370,7 @@ TwlMain()
 	// 全ハードウェア情報の更新
 	for (i=0;i<MAX_RETRY_COUNT;i++)
 	{
-		hw_info_result = WriteHWInfoFile(OS_GetRegion(), OS_IsForceDisableWireless());
+		hw_info_result = WriteHWInfoFile(%region%, OS_IsForceDisableWireless());
 		if (hw_info_result)
 		{
 			kamiFontPrintf( 0, printLine++, FONT_COLOR_GREEN, "Write Hardware Info Success.");